Commit c965d364842e1480481d1a37cf11d6e23c2debdb
1 parent
9f913848
增加公司，分公司查询条件，公司，分公司，线路都是跟登录用户权限的,导出的数据和查询条件一致
Showing
2 changed files
with
58 additions
and
4 deletions
src/main/resources/static/pages/scheduleApp/module/core/busConfig/detail.html
| ... | ... | @@ -58,6 +58,22 @@ |
| 58 | 58 | </div> |
| 59 | 59 | |
| 60 | 60 | <div class="form-group has-success has-feedback"> |
| 61 | + <label class="col-md-2 control-label">所在公司：</label> | |
| 62 | + <div class="col-md-3"> | |
| 63 | + <input type="text" class="form-control" name="cl" | |
| 64 | + ng-model="ctrl.busConfigForDetail.cl.company" readonly/> | |
| 65 | + </div> | |
| 66 | + </div> | |
| 67 | + | |
| 68 | + <div class="form-group has-success has-feedback"> | |
| 69 | + <label class="col-md-2 control-label">所在分公司：</label> | |
| 70 | + <div class="col-md-3"> | |
| 71 | + <input type="text" class="form-control" name="cl" | |
| 72 | + ng-model="ctrl.busConfigForDetail.cl.brancheCompany" readonly/> | |
| 73 | + </div> | |
| 74 | + </div> | |
| 75 | + | |
| 76 | + <div class="form-group has-success has-feedback"> | |
| 61 | 77 | <label class="col-md-2 control-label">启用日期*：</label> |
| 62 | 78 | <div class="col-md-4"> |
| 63 | 79 | <input type="text" class="form-control" | ... | ... |
src/main/resources/static/pages/scheduleApp/module/core/busConfig/list.html
| ... | ... | @@ -6,12 +6,14 @@ |
| 6 | 6 | <tr role="row" class="heading"> |
| 7 | 7 | <th style="width: 70px;">序号</th> |
| 8 | 8 | <th style="width: 150px;">线路</th> |
| 9 | - <th style="width: 150px;">内部编号</th> | |
| 10 | - <th style="width: 150px;">设备编号</th> | |
| 11 | - <th style="width: 150px;">启用日期</th> | |
| 9 | + <th style="width: 150px;">所在公司</th> | |
| 10 | + <th style="width: 160px;">所在分公司</th> | |
| 11 | + <th style="width: 100px;">内部编号</th> | |
| 12 | + <th style="width: 100px;">设备编号</th> | |
| 13 | + <th style="width: 100px;">启用日期</th> | |
| 12 | 14 | <th >停车点</th> |
| 13 | 15 | <th style="width: 80px;" >状态</th> |
| 14 | - <th style="width: 21%">操作</th> | |
| 16 | + <th>操作</th> | |
| 15 | 17 | </tr> |
| 16 | 18 | <tr role="row" class="filter"> |
| 17 | 19 | <td></td> |
| ... | ... | @@ -32,6 +34,36 @@ |
| 32 | 34 | </div> |
| 33 | 35 | </td> |
| 34 | 36 | <td> |
| 37 | + <sa-Select5 name="gs" | |
| 38 | + model="ctrl.searchCondition()" | |
| 39 | + cmaps="{'cl.businessCode_eq': 'businessCode'}" | |
| 40 | + dcname="cl.businessCode_eq" | |
| 41 | + icname="businessCode" | |
| 42 | + dsparams="{{ {type: 'ajax', param:{'upCode_eq': '88' }, atype:'gs' } | json }}" | |
| 43 | + iterobjname="item" | |
| 44 | + iterobjexp="item.businessName" | |
| 45 | + searchph="请输拼音..." | |
| 46 | + searchexp="this.businessName" | |
| 47 | + required | |
| 48 | + > | |
| 49 | + </sa-Select5> | |
| 50 | + </td> | |
| 51 | + <td> | |
| 52 | + <sa-Select5 name="fgs" | |
| 53 | + model="ctrl.searchCondition()" | |
| 54 | + cmaps="{'cl.brancheCompanyCode_eq': 'businessCode'}" | |
| 55 | + dcname="cl.brancheCompanyCode_eq" | |
| 56 | + icname="businessCode" | |
| 57 | + dsparams="{{ {type: 'ajax', param:{'upCode_eq': ctrl.searchCondition()['cl.businessCode_eq'] }, atype:'gs' } | json }}" | |
| 58 | + iterobjname="item" | |
| 59 | + iterobjexp="item.businessName" | |
| 60 | + searchph="请输拼音..." | |
| 61 | + searchexp="this.businessName" | |
| 62 | + required | |
| 63 | + > | |
| 64 | + </sa-Select5> | |
| 65 | + </td> | |
| 66 | + <td> | |
| 35 | 67 | <input type="text" class="form-control form-filter input-sm" ng-model="ctrl.searchCondition()['cl.insideCode_like']" placeholder="输入内部编号..."/> |
| 36 | 68 | </td> |
| 37 | 69 | <td></td> |
| ... | ... | @@ -69,6 +101,12 @@ |
| 69 | 101 | <span ng-bind="info.xl.name"></span> |
| 70 | 102 | </td> |
| 71 | 103 | <td> |
| 104 | + <span ng-bind="info.cl.company"></span> | |
| 105 | + </td> | |
| 106 | + <td> | |
| 107 | + <span ng-bind="info.cl.brancheCompany"></span> | |
| 108 | + </td> | |
| 109 | + <td> | |
| 72 | 110 | <span ng-bind="info.cl.insideCode"></span> |
| 73 | 111 | </td> |
| 74 | 112 | <td> | ... | ... |