新分支 bo_dev
This commit is contained in:
bo.yang
parent
c6d239fea2
commit
492b3618c6
|
|
@ -1,7 +1,6 @@
|
|||
package com.ruoyi.bps.controller;
|
||||
|
||||
import com.ruoyi.bps.domain.ExpImportQuery;
|
||||
import com.ruoyi.bps.domain.ExpSubsPushResp;
|
||||
import com.ruoyi.bps.domain.ExpressInfo;
|
||||
import com.ruoyi.bps.mapper.ExpressInfoMapper;
|
||||
import com.ruoyi.bps.service.IExpImportQueryService;
|
||||
|
|
@ -12,19 +11,16 @@ import com.ruoyi.common.core.domain.AjaxResult;
|
|||
import com.ruoyi.common.core.page.TableDataInfo;
|
||||
import com.ruoyi.common.enums.BusinessType;
|
||||
import com.ruoyi.common.utils.DateUtils;
|
||||
import com.ruoyi.common.utils.ExceptionUtil;
|
||||
import com.ruoyi.common.utils.ShiroUtils;
|
||||
import com.ruoyi.common.utils.poi.ExcelUtil;
|
||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.ui.ModelMap;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -0,0 +1,139 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
|
||||
<head>
|
||||
<th:block th:include="include :: header('快递信息列表')" />
|
||||
</head>
|
||||
<body class="gray-bg">
|
||||
<div class="container-div">
|
||||
<div class="row">
|
||||
<div class="col-sm-12 search-collapse">
|
||||
<form id="formId" th:object="${expressInfo}">
|
||||
<div class="select-list">
|
||||
<ul>
|
||||
<li>
|
||||
<label>查询ID：</label>
|
||||
<input type="text" name="queryId" th:field="*{queryId}"/>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<div class="btn-group-sm" id="toolbar" role="group">
|
||||
<a class="btn btn-warning" onclick="$.table.exportExcel()" >
|
||||
<i class="fa fa-download"></i> 导出
|
||||
</a>
|
||||
</div>
|
||||
<div class="col-sm-12 select-table table-striped">
|
||||
<table id="bootstrap-table"></table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<th:block th:include="include :: footer" />
|
||||
<script th:inline="javascript">
|
||||
var editFlag = [[${@permission.hasPermi('bps:expressInfo:edit')}]];
|
||||
var removeFlag = [[${@permission.hasPermi('bps:expressInfo:remove')}]];
|
||||
|
||||
var prefix = ctx + "bps/expressInfo";
|
||||
var datas = [[${@dict.getType('express_company')}]];
|
||||
var stats= [[${@dict.getType('express_stats')}]];
|
||||
|
||||
$(function() {
|
||||
var options = {
|
||||
url: prefix + "/localList",
|
||||
exportUrl: ctx+ "bps/expImportQuery/exportDetail",
|
||||
modalName: "快递信息",
|
||||
columns: [{
|
||||
checkbox: true
|
||||
},
|
||||
/*
|
||||
{
|
||||
field: 'message',
|
||||
title: '消息'
|
||||
},*/
|
||||
{
|
||||
field: 'deliveryNum',
|
||||
title: '出货单号'
|
||||
},
|
||||
{
|
||||
field: 'nu',
|
||||
title: '快递单号'
|
||||
},
|
||||
/*
|
||||
{
|
||||
field: 'ischeck',
|
||||
title: '签收状态'
|
||||
},*/
|
||||
{
|
||||
field: 'com',
|
||||
title: '快递公司',
|
||||
formatter: function(value, row, index) {
|
||||
return $.table.selectDictLabel(datas, value);
|
||||
}
|
||||
},
|
||||
/*
|
||||
{
|
||||
field: 'status',
|
||||
title: '通信状态'
|
||||
},*/
|
||||
{
|
||||
field: 'data',
|
||||
title: '运单详情',
|
||||
formatter:function (value,row,index){
|
||||
return value.replace(/(\r\n)|(\n)/g,'<br>');
|
||||
}
|
||||
},
|
||||
{
|
||||
field: 'state',
|
||||
title: '当前状态',
|
||||
formatter: function(value, row, index) {
|
||||
return $.table.selectDictLabel(stats, value);
|
||||
}
|
||||
},/*
|
||||
{
|
||||
field: 'condition',
|
||||
title: '状态标志'
|
||||
},
|
||||
{
|
||||
field: 'routeInfo',
|
||||
title: '路由信息'
|
||||
},
|
||||
{
|
||||
field: 'returnCode',
|
||||
title: '返回码'
|
||||
},
|
||||
{
|
||||
field: 'result',
|
||||
title: '返回结果'
|
||||
},*/
|
||||
|
||||
{
|
||||
field: 'phone',
|
||||
title: '电话号码'
|
||||
},
|
||||
{
|
||||
field: 'singedTime',
|
||||
title: '签收时间'
|
||||
},
|
||||
{
|
||||
field: 'collectTime',
|
||||
title: '揽收时间'
|
||||
},
|
||||
{
|
||||
field: 'lastUpdateTime',
|
||||
title: '最后更新时间'
|
||||
},
|
||||
{
|
||||
field: 'queryTime',
|
||||
title: '查询时间'
|
||||
},
|
||||
{
|
||||
field: 'queryUserName',
|
||||
title: '查询人'
|
||||
}]
|
||||
};
|
||||
$.table.init(options);
|
||||
});
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
Loading…
Reference in New Issue