优化快递查询显示
This commit is contained in:
bo.yang
parent
854917a0c9
commit
be55671f8e
|
|
@ -87,7 +87,7 @@ public class ExpSubsPushApiServiceImpl implements IExpSubsPushApiService {
|
||||||
newExpSubscribe.setPhone(expSubscribe.getPhone());
|
newExpSubscribe.setPhone(expSubscribe.getPhone());
|
||||||
newExpSubscribe.setSalt("bpsemi");
|
newExpSubscribe.setSalt("bpsemi");
|
||||||
newExpSubscribe.setSubscribeTime(DateUtils.dateTimeNow("yyyy-MM-dd HH:mm:ss"));
|
newExpSubscribe.setSubscribeTime(DateUtils.dateTimeNow("yyyy-MM-dd HH:mm:ss"));
|
||||||
newExpSubscribe.setResult((subscribeResp.isResult())?"ture":"false");
|
newExpSubscribe.setResult((subscribeResp.isResult())?"true":"false");
|
||||||
newExpSubscribe.setReturnCode(subscribeResp.getReturnCode());
|
newExpSubscribe.setReturnCode(subscribeResp.getReturnCode());
|
||||||
newExpSubscribe.setMessage(subscribeResp.getMessage());
|
newExpSubscribe.setMessage(subscribeResp.getMessage());
|
||||||
|
|
||||||
|
|
@ -243,8 +243,7 @@ public class ExpSubsPushApiServiceImpl implements IExpSubsPushApiService {
|
||||||
}
|
}
|
||||||
str+=subscribePushData.getContext();
|
str+=subscribePushData.getContext();
|
||||||
if(list.size()-1>list.indexOf(subscribePushData)){
|
if(list.size()-1>list.indexOf(subscribePushData)){
|
||||||
//str+="\r\n";
|
str+="\r\n";
|
||||||
str+="</br>";
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
System.out.println(str);
|
System.out.println(str);
|
||||||
|
|
|
||||||
|
|
@ -165,7 +165,7 @@ public class ExpressInfoServiceImpl implements IExpressInfoService
|
||||||
dataStr+="【"+queryTrackData.getTime()+"】 ";
|
dataStr+="【"+queryTrackData.getTime()+"】 ";
|
||||||
dataStr+=queryTrackData.getContext();
|
dataStr+=queryTrackData.getContext();
|
||||||
if(queryTrackResp.getData().size()-1>queryTrackResp.getData().indexOf(queryTrackData)){
|
if(queryTrackResp.getData().size()-1>queryTrackResp.getData().indexOf(queryTrackData)){
|
||||||
dataStr+="\r";
|
dataStr+="\r\n";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ExpressInfo callbackExpressInfo=new ExpressInfo();
|
ExpressInfo callbackExpressInfo=new ExpressInfo();
|
||||||
|
|
|
||||||
|
|
@ -32,7 +32,7 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="btn-group-sm" id="toolbar" role="group">
|
<div class="btn-group-sm" id="toolbar" role="group">
|
||||||
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="bps:expressInfo:add">
|
<!--<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="bps:expressInfo:add">
|
||||||
<i class="fa fa-plus"></i> 添加
|
<i class="fa fa-plus"></i> 添加
|
||||||
</a>
|
</a>
|
||||||
<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="bps:expressInfo:edit">
|
<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="bps:expressInfo:edit">
|
||||||
|
|
@ -40,7 +40,7 @@
|
||||||
</a>
|
</a>
|
||||||
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="bps:expressInfo:remove">
|
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="bps:expressInfo:remove">
|
||||||
<i class="fa fa-remove"></i> 删除
|
<i class="fa fa-remove"></i> 删除
|
||||||
</a>
|
</a>-->
|
||||||
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="bps:expressInfo:export">
|
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="bps:expressInfo:export">
|
||||||
<i class="fa fa-download"></i> 导出
|
<i class="fa fa-download"></i> 导出
|
||||||
</a>
|
</a>
|
||||||
|
|
@ -68,7 +68,7 @@
|
||||||
exportUrl: prefix + "/export",
|
exportUrl: prefix + "/export",
|
||||||
modalName: "快递信息",
|
modalName: "快递信息",
|
||||||
columns: [{
|
columns: [{
|
||||||
checkbox: true
|
checkbox: false
|
||||||
},
|
},
|
||||||
/*
|
/*
|
||||||
{
|
{
|
||||||
|
|
@ -98,7 +98,10 @@
|
||||||
},*/
|
},*/
|
||||||
{
|
{
|
||||||
field: 'data',
|
field: 'data',
|
||||||
title: '运单详情'
|
title: '运单详情',
|
||||||
|
formatter:function (value,row,index){
|
||||||
|
return value.replace(/(\r\n)|(\n)/g,'<br>');
|
||||||
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
field: 'state',
|
field: 'state',
|
||||||
|
|
@ -126,7 +129,7 @@
|
||||||
{
|
{
|
||||||
field: 'phone',
|
field: 'phone',
|
||||||
title: '电话号码'
|
title: '电话号码'
|
||||||
},
|
}/*,
|
||||||
{
|
{
|
||||||
title: '操作',
|
title: '操作',
|
||||||
align: 'center',
|
align: 'center',
|
||||||
|
|
@ -136,7 +139,7 @@
|
||||||
actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.message + '\')"><i class="fa fa-remove"></i>删除</a>');
|
actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.message + '\')"><i class="fa fa-remove"></i>删除</a>');
|
||||||
return actions.join('');
|
return actions.join('');
|
||||||
}
|
}
|
||||||
}]
|
}*/]
|
||||||
};
|
};
|
||||||
$.table.init(options);
|
$.table.init(options);
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@
|
||||||
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
|
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
|
||||||
<head>
|
<head>
|
||||||
<th:block th:include="include :: header('快递订阅推送信息列表')" />
|
<th:block th:include="include :: header('快递订阅推送信息列表')" />
|
||||||
|
<th:block th:include="include :: select2-css" />
|
||||||
</head>
|
</head>
|
||||||
<body class="gray-bg">
|
<body class="gray-bg">
|
||||||
<div class="container-div">
|
<div class="container-div">
|
||||||
|
|
@ -10,30 +11,9 @@
|
||||||
<form id="formId">
|
<form id="formId">
|
||||||
<div class="select-list">
|
<div class="select-list">
|
||||||
<ul>
|
<ul>
|
||||||
<!--<li>
|
|
||||||
<label>监控状态：</label>
|
|
||||||
<select name="status">
|
|
||||||
<option value="">所有</option>
|
|
||||||
<option value="-1">代码生成请选择字典属性</option>
|
|
||||||
</select>
|
|
||||||
</li>-->
|
|
||||||
<!--<li>
|
|
||||||
<label>当前状态：</label>
|
|
||||||
<input type="text" name="lastResultState"/>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<label>是否签收：</label>
|
|
||||||
<input type="text" name="lastResultIsCheck"/>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<label>快递公司编码：</label>
|
|
||||||
<input type="text" name="lastResultCom"/>
|
|
||||||
<label class="font-noraml">快递公司：</label>
|
|
||||||
</li>-->
|
|
||||||
|
|
||||||
<li>
|
<li>
|
||||||
<label class="font-noraml">当前状态：</label>
|
<label class="font-noraml">当前状态：</label>
|
||||||
<select class="form-control" name="lastResultState" th:with="type=${@dict.getType('express_stats')}">
|
<select class="form-control select" name="lastResultState" th:with="type=${@dict.getType('express_stats')}">
|
||||||
<option value="">---所有---</option>
|
<option value="">---所有---</option>
|
||||||
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
|
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
|
||||||
</select>
|
</select>
|
||||||
|
|
@ -57,22 +37,6 @@
|
||||||
<label>快递单号：</label>
|
<label>快递单号：</label>
|
||||||
<input type="text" name="lastResultNu"/>
|
<input type="text" name="lastResultNu"/>
|
||||||
</li>
|
</li>
|
||||||
<!--<li>
|
|
||||||
<label>目的国快递单状态：</label>
|
|
||||||
<input type="text" name="destResultState"/>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<label>目的国是否签收：</label>
|
|
||||||
<input type="text" name="destResultIsCheck"/>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<label>目的国快递公司编码：</label>
|
|
||||||
<input type="text" name="destResultCom"/>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<label>目的国快递单号：</label>
|
|
||||||
<input type="text" name="destResultNu"/>
|
|
||||||
</li>-->
|
|
||||||
<li>
|
<li>
|
||||||
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a>
|
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a>
|
||||||
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i> 重置</a>
|
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i> 重置</a>
|
||||||
|
|
@ -102,6 +66,7 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<th:block th:include="include :: footer" />
|
<th:block th:include="include :: footer" />
|
||||||
|
<th:block th:include="include :: select2-js" />
|
||||||
<script th:inline="javascript">
|
<script th:inline="javascript">
|
||||||
var editFlag = [[${@permission.hasPermi('bps:expsubspushresp:edit')}]];
|
var editFlag = [[${@permission.hasPermi('bps:expsubspushresp:edit')}]];
|
||||||
var removeFlag = [[${@permission.hasPermi('bps:expsubspushresp:remove')}]];
|
var removeFlag = [[${@permission.hasPermi('bps:expsubspushresp:remove')}]];
|
||||||
|
|
@ -170,7 +135,12 @@
|
||||||
},*/
|
},*/
|
||||||
{
|
{
|
||||||
field: 'lastResultIsCheck',
|
field: 'lastResultIsCheck',
|
||||||
title: '是否签收'
|
title: '是否签收',
|
||||||
|
formatter: function(value, row, index) {
|
||||||
|
if(value=="0"){return "未签收";}
|
||||||
|
if(value=="1"){return "已签收";}
|
||||||
|
return value;
|
||||||
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
field: 'lastResultCom',
|
field: 'lastResultCom',
|
||||||
|
|
@ -185,7 +155,10 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
field: 'lastResultData',
|
field: 'lastResultData',
|
||||||
title: '快递流转信息'
|
title: '运单详情',
|
||||||
|
formatter:function (value,row,index){
|
||||||
|
return value.replace(/(\r\n)|(\n)/g,'<br>');
|
||||||
|
}
|
||||||
},/*
|
},/*
|
||||||
{
|
{
|
||||||
field: 'destResultMessage',
|
field: 'destResultMessage',
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue