parent
9d5865cc15
commit
889e491f7b
|
|
@ -65,7 +65,7 @@ public class ExpSubscribeController extends BaseController
|
|||
public TableDataInfo list(ExpSubscribe expSubscribe)
|
||||
{
|
||||
startPage();
|
||||
List<ExpSubscribe> list = new ArrayList<>();
|
||||
List<ExpSubscribe> list;
|
||||
if(expSubscribe.getNumber().contains(",")){
|
||||
List<String> number= Arrays.asList(expSubscribe.getNumber().split(","));
|
||||
list=expSubscribeService.selectExpSubsPushRespByNumber(number);
|
||||
|
|
|
|||
|
|
@ -80,11 +80,12 @@
|
|||
$("#form-subscribe-add").serializeArray().map(function(val,key){formObject[val.name]=val.value;})
|
||||
|
||||
$.ajax({
|
||||
url:ctx+"/bps/subscribe/subscribe",
|
||||
url:ctx+"bps/subscribe/subscribe",
|
||||
type:"POST",
|
||||
contentType: "application/json",
|
||||
data: JSON.stringify(formObject),
|
||||
dataType: "json",
|
||||
async:false, //如果不加async:false参数,ajax请求默认是异步的,会出现工程启动后第一次订阅,返回canceled,不执行success任务的问题
|
||||
success:function(data){
|
||||
alert(JSON.stringify(data));
|
||||
parent.$("#number").val($("#number").val());
|
||||
|
|
@ -94,7 +95,6 @@
|
|||
alert("错误!!");
|
||||
}
|
||||
});
|
||||
|
||||
};
|
||||
</script>
|
||||
</body>
|
||||
|
|
|
|||
|
|
@ -75,6 +75,7 @@
|
|||
<script th:inline="javascript">
|
||||
var editFlag = [[${@permission.hasPermi('bps:subscribe:edit')}]];
|
||||
var removeFlag = [[${@permission.hasPermi('bps:subscribe:remove')}]];
|
||||
var stepToResp = [[${@permission.hasPermi('bps:expsubspushresp:list')}]];
|
||||
var companyDatas = [[${@dict.getType('express_company')}]];
|
||||
var prefix = ctx + "bps/subscribe";
|
||||
|
||||
|
|
@ -134,6 +135,7 @@
|
|||
align: 'center',
|
||||
formatter: function(value, row, index) {
|
||||
var actions = [];
|
||||
/*actions.push('<a class="btn btn-danger btn-xs ' + stepToResp + '" href="expsubspushresp/list/'+row.sid+'"><i class="fa fa-search"></i>信息跟踪</a>');*/
|
||||
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.sid + '\')"><i class="fa fa-edit"></i>编辑</a> ');
|
||||
actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.sid + '\')"><i class="fa fa-remove"></i>删除</a>');
|
||||
return actions.join('');
|
||||
|
|
|
|||
Loading…
Reference in New Issue