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

Commit 887c2573 authored by jiangxiulong's avatar jiangxiulong

reset

parent 1ec2d4bf
...@@ -294,16 +294,6 @@ public class PerformancesExpressController extends BaseController { ...@@ -294,16 +294,6 @@ public class PerformancesExpressController extends BaseController {
} }
} }
// 导出数据
@PostMapping("/export")
@ResponseBody
public AjaxResult export(@RequestParam("ids") String performanceId)
{
List<Xxxx> list = xxxxService.selectXxxxList(xxxx);
ExcelUtil<Xxxx> util = new ExcelUtil<Xxxx>(Xxxx.class);
return util.exportExcel(list, "xx数据");
}
/** /**
* 打印单条获取数据 * 打印单条获取数据
*/ */
......
...@@ -44,7 +44,6 @@ ...@@ -44,7 +44,6 @@
var prefix = ctx + "kylin/performancesExpress"; var prefix = ctx + "kylin/performancesExpress";
var batchGenerateImageFlag = [[${@permission.hasPermi('kylin:performancesExpress:batchGenerateImage')}]]; var batchGenerateImageFlag = [[${@permission.hasPermi('kylin:performancesExpress:batchGenerateImage')}]];
var batchPrintExpressFlag = [[${@permission.hasPermi('kylin:performancesExpress:batchPrintExpress')}]]; var batchPrintExpressFlag = [[${@permission.hasPermi('kylin:performancesExpress:batchPrintExpress')}]];
var exportExcelFlag = [[${@permission.hasPermi('kylin:performancesExpress:exportExcelFlag')}]];
function generateImage(performanceId) { function generateImage(performanceId) {
var configPrint = { var configPrint = {
...@@ -294,7 +293,6 @@ ...@@ -294,7 +293,6 @@
batchCancelOrderUrl: prefix + "/batchCancelOrder", batchCancelOrderUrl: prefix + "/batchCancelOrder",
batchGenerateImageUrl: prefix + "/batchGenerateImage", batchGenerateImageUrl: prefix + "/batchGenerateImage",
batchPrintExpressUrl: prefix + "/batchPrintExpress", batchPrintExpressUrl: prefix + "/batchPrintExpress",
exportUrl: prefix + "/export",
modalName: "演出快递", modalName: "演出快递",
columns: [ columns: [
{ {
...@@ -335,7 +333,6 @@ ...@@ -335,7 +333,6 @@
actions.push('<a class="btn btn-warning btn-xs ' + batchCancelOrderFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.performancesId + '\', \'确定批量取消吗?\', table.options.batchCancelOrderUrl)"></i>取消</a> '); actions.push('<a class="btn btn-warning btn-xs ' + batchCancelOrderFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.performancesId + '\', \'确定批量取消吗?\', table.options.batchCancelOrderUrl)"></i>取消</a> ');
// actions.push('<a class="btn btn-warning btn-xs ' + batchGenerateImageFlag + '" href="javascript:void(0)" onclick="generateImage(\'' + row.performancesId + '\',)"></i>下载快递单</a> '); // actions.push('<a class="btn btn-warning btn-xs ' + batchGenerateImageFlag + '" href="javascript:void(0)" onclick="generateImage(\'' + row.performancesId + '\',)"></i>下载快递单</a> ');
actions.push('<a class="btn btn-warning btn-xs ' + batchPrintExpressFlag + '" href="javascript:void(0)" onclick="printExpress(\'' + row.performancesId + '\',)"></i>打印快递单</a> '); actions.push('<a class="btn btn-warning btn-xs ' + batchPrintExpressFlag + '" href="javascript:void(0)" onclick="printExpress(\'' + row.performancesId + '\',)"></i>打印快递单</a> ');
actions.push('<a class="btn btn-warning btn-xs ' + exportExcelFlag + '" href="javascript:void(0)" onclick="$.table.exportExcel()"></i>导出快递单</a> ');
return actions.join(''); return actions.join('');
} }
}] }]
......
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