Commit 348f5b67bee1605d586af3a909317c5e44d4b3f6
1 parent
d658c65f
feat:集成积木报表
Showing
5 changed files
with
43 additions
and
21 deletions
pom.xml
| ... | ... | @@ -26,7 +26,7 @@ |
| 26 | 26 | <thymeleaf.extras.shiro.version>2.0.0</thymeleaf.extras.shiro.version> |
| 27 | 27 | <!--<mybatis.spring.boot.starter.version>1.3.2</mybatis.spring.boot.starter.version>--> |
| 28 | 28 | <pagehelper.spring.boot.starter.version>1.2.12</pagehelper.spring.boot.starter.version> |
| 29 | - <fastjson.version>1.2.59</fastjson.version> | |
| 29 | + <fastjson.version>1.2.79</fastjson.version> | |
| 30 | 30 | <druid.version>1.1.23</druid.version> |
| 31 | 31 | <commons.io.version>2.5</commons.io.version> |
| 32 | 32 | <commons.fileupload.version>1.4</commons.fileupload.version> |
| ... | ... | @@ -44,9 +44,9 @@ |
| 44 | 44 | <!--报错--> |
| 45 | 45 | <!-- https://mvnrepository.com/artifact/collections-generic/collections-generic --> |
| 46 | 46 | <!--<dependency>--> |
| 47 | - <!--<groupId>collections-generic</groupId>--> | |
| 48 | - <!--<artifactId>collections-generic</artifactId>--> | |
| 49 | - <!--<version>4.01</version>--> | |
| 47 | + <!--<groupId>collections-generic</groupId>--> | |
| 48 | + <!--<artifactId>collections-generic</artifactId>--> | |
| 49 | + <!--<version>4.01</version>--> | |
| 50 | 50 | <!--</dependency>--> |
| 51 | 51 | <dependency> |
| 52 | 52 | <groupId>org.webjars</groupId> |
| ... | ... | @@ -213,6 +213,12 @@ |
| 213 | 213 | </exclusion> |
| 214 | 214 | </exclusions> |
| 215 | 215 | </dependency> |
| 216 | + <!--集成积木报表--> | |
| 217 | + <dependency> | |
| 218 | + <groupId>org.jeecgframework.jimureport</groupId> | |
| 219 | + <artifactId>jimureport-spring-boot-starter</artifactId> | |
| 220 | + <version>1.5.2</version> | |
| 221 | + </dependency> | |
| 216 | 222 | <dependency> |
| 217 | 223 | <groupId>org.apache.xmlgraphics</groupId> |
| 218 | 224 | <artifactId>batik-bridge</artifactId> |
| ... | ... |
src/main/java/com/huaheng/framework/config/ShiroConfig.java
| ... | ... | @@ -265,6 +265,10 @@ public class ShiroConfig { |
| 265 | 265 | filterChainDefinitionMap.put("/mobile/login", "anon"); |
| 266 | 266 | filterChainDefinitionMap.put("/api/getTokenForMobile", "anon"); |
| 267 | 267 | filterChainDefinitionMap.put("/getWarehouseByUserCode", "anon"); |
| 268 | + //积木报表排除 | |
| 269 | + filterChainDefinitionMap.put("/jmreport/**", "anon"); | |
| 270 | + filterChainDefinitionMap.put("/**/*.js.map", "anon"); | |
| 271 | + filterChainDefinitionMap.put("/**/*.css.map", "anon"); | |
| 268 | 272 | // filterChainDefinitionMap.put("/websocket", "anon"); |
| 269 | 273 | // filterChainDefinitionMap.put("/websocket/*", "anon"); |
| 270 | 274 | // filterChainDefinitionMap.put("/user/lincoln/message", "anon"); |
| ... | ... | @@ -287,6 +291,7 @@ public class ShiroConfig { |
| 287 | 291 | // 系统权限列表 |
| 288 | 292 | // filterChainDefinitionMap.putAll(SpringUtils.getBean(IMenuService.class).selectPermsAll()); |
| 289 | 293 | |
| 294 | + //websocket | |
| 290 | 295 | Map<String, Filter> filters = new LinkedHashMap<>(); |
| 291 | 296 | filters.put("onlineSession", onlineSessionFilter()); |
| 292 | 297 | filters.put("syncOnlineSession", syncOnlineSessionFilter()); |
| ... | ... |
src/main/resources/application.yml
src/main/resources/templates/config/container/container.html
| ... | ... | @@ -263,6 +263,20 @@ |
| 263 | 263 | $.table.init(options); |
| 264 | 264 | }); |
| 265 | 265 | |
| 266 | + // function print() { | |
| 267 | + // var rows = $("#bootstrap-table").bootstrapTable('getSelections'); | |
| 268 | + // if (rows.length == 0) { | |
| 269 | + // $.modal.alertWarning("请至少选择一条记录"); | |
| 270 | + // return; | |
| 271 | + // } | |
| 272 | + // var ids = ""; | |
| 273 | + // for (var i = 0; i < rows.length; i++) { | |
| 274 | + // ids = ids + rows[i].id + "," | |
| 275 | + // } | |
| 276 | + // let url = prefix + '/print/' + ids; | |
| 277 | + // $.modal.open("打印", url); | |
| 278 | + // } | |
| 279 | + | |
| 266 | 280 | function print() { |
| 267 | 281 | var rows = $("#bootstrap-table").bootstrapTable('getSelections'); |
| 268 | 282 | if (rows.length == 0) { |
| ... | ... | @@ -273,7 +287,7 @@ |
| 273 | 287 | for (var i = 0; i < rows.length; i++) { |
| 274 | 288 | ids = ids + rows[i].id + "," |
| 275 | 289 | } |
| 276 | - let url = prefix + '/print/' + ids; | |
| 290 | + let url = ctx + 'jmreport/view/886858564044673024/?id=' + ids; | |
| 277 | 291 | $.modal.open("打印", url); |
| 278 | 292 | } |
| 279 | 293 | |
| ... | ... |
src/main/resources/templates/shipment/shipmentHeader/shipmentHeader.html
| ... | ... | @@ -515,22 +515,6 @@ |
| 515 | 515 | field: 'totalLines', |
| 516 | 516 | title: '总行数' |
| 517 | 517 | }, |
| 518 | - | |
| 519 | - // { | |
| 520 | - // field: 'companyCode', | |
| 521 | - // title: '货主', | |
| 522 | - // align: 'center', | |
| 523 | - // formatter: function (value, row, index) { | |
| 524 | - // var actions = []; | |
| 525 | - // $.each(company, function (index, dict) { | |
| 526 | - // if (dict.code == value) { | |
| 527 | - // actions.push("<span class='badge badge-info'>" + dict.name + "</span>"); | |
| 528 | - // return false; | |
| 529 | - // } | |
| 530 | - // }); | |
| 531 | - // return actions.join(''); | |
| 532 | - // } | |
| 533 | - // }, | |
| 534 | 518 | { |
| 535 | 519 | field: 'warehouseCode', |
| 536 | 520 | title: '仓库', |
| ... | ... |