Commit 8c10e23384ffbe7e38a1b50f600d7082ec35e4c7
Merge branch 'minhang' of 192.168.168.201:panzhaov5/bsth_control into
minhang
Showing
3 changed files
with
6 additions
and
5 deletions
src/main/java/com/bsth/service/schedule/PeopleCarPlanServiceImpl.java
| @@ -180,6 +180,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { | @@ -180,6 +180,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { | ||
| 180 | 180 | ||
| 181 | 181 | ||
| 182 | } catch (Exception e) { | 182 | } catch (Exception e) { |
| 183 | + | ||
| 183 | // TODO Auto-generated catch block | 184 | // TODO Auto-generated catch block |
| 184 | e.printStackTrace(); | 185 | e.printStackTrace(); |
| 185 | } | 186 | } |
src/main/resources/static/pages/forms/mould/peoCarPlan.xls
No preview for this file type
src/main/resources/static/pages/report/message/message.html
| @@ -41,9 +41,9 @@ | @@ -41,9 +41,9 @@ | ||
| 41 | </div> | 41 | </div> |
| 42 | <div class="form-group" style="display: inline-block;margin-left: 15px;"> | 42 | <div class="form-group" style="display: inline-block;margin-left: 15px;"> |
| 43 | <input class="btn btn-default" type="button" id="query" value="查询"/> | 43 | <input class="btn btn-default" type="button" id="query" value="查询"/> |
| 44 | - <input class="btn btn-default" type="button" id="export" value="导出"/> | 44 | +<!-- <input class="btn btn-default" type="button" id="export" value="导出"/> --> |
| 45 | <input class="btn btn-default" type="button" id="print" value="打印"/> | 45 | <input class="btn btn-default" type="button" id="print" value="打印"/> |
| 46 | - <input class="btn btn-default" type="button" id="exportMore" value="批量导出"/> | 46 | +<!-- <input class="btn btn-default" type="button" id="exportMore" value="批量导出"/> --> |
| 47 | </div> | 47 | </div> |
| 48 | </form> | 48 | </form> |
| 49 | </div> | 49 | </div> |
| @@ -235,12 +235,12 @@ | @@ -235,12 +235,12 @@ | ||
| 235 | {{each list as obj i}} | 235 | {{each list as obj i}} |
| 236 | <tr> | 236 | <tr> |
| 237 | <td>{{i+1}}</td> | 237 | <td>{{i+1}}</td> |
| 238 | + <td>{{obj[4]}}</td> | ||
| 239 | + <td>{{obj[6]}}</td> | ||
| 238 | <td>{{obj[0]}}</td> | 240 | <td>{{obj[0]}}</td> |
| 239 | <td>{{obj[1]}}</td> | 241 | <td>{{obj[1]}}</td> |
| 240 | - <td>{{obj[2]}}</td> | ||
| 241 | <td>{{obj[3]}}</td> | 242 | <td>{{obj[3]}}</td> |
| 242 | - <td>{{obj[4]}}</td> | ||
| 243 | - <td>{{obj[5]}}</td> | 243 | + <td>{{obj[2]}}</td> |
| 244 | </tr> | 244 | </tr> |
| 245 | {{/each}} | 245 | {{/each}} |
| 246 | {{if list.length == 0}} | 246 | {{if list.length == 0}} |