增加公司，分公司查询条件，公司，分公司，线路都是跟登录用户权限的,导出的数据和查询条件一致

徐烜
1 parent 9f913848
Showing 2 changed files with 58 additions and 4 deletions
src/main/resources/static/pages/scheduleApp/module/core/busConfig/detail.html
src/main/resources/static/pages/scheduleApp/module/core/busConfig/list.html
@@ -58,6 +58,22 @@
                 </div>
                 <div class="form-group has-success has-feedback">
+                    <label class="col-md-2 control-label">所在公司：</label>
+                    <div class="col-md-3">
+                        <input type="text" class="form-control" name="cl"
+                               ng-model="ctrl.busConfigForDetail.cl.company" readonly/>
+                    </div>
+                </div>
+
+                <div class="form-group has-success has-feedback">
+                    <label class="col-md-2 control-label">所在分公司：</label>
+                    <div class="col-md-3">
+                        <input type="text" class="form-control" name="cl"
+                               ng-model="ctrl.busConfigForDetail.cl.brancheCompany" readonly/>
+                    </div>
+                </div>
+
+                <div class="form-group has-success has-feedback">
                     <label class="col-md-2 control-label">启用日期*：</label>
                     <div class="col-md-4">
                         <input type="text" class="form-control"
@@ -6,12 +6,14 @@
             <tr role="row" class="heading">
                 <th style="width: 70px;">序号</th>
                 <th style="width: 150px;">线路</th>
-                <th style="width: 150px;">内部编号</th>
-                <th style="width: 150px;">设备编号</th>
-                <th style="width: 150px;">启用日期</th>
+                <th style="width: 150px;">所在公司</th>
+                <th style="width: 160px;">所在分公司</th>
+                <th style="width: 100px;">内部编号</th>
+                <th style="width: 100px;">设备编号</th>
+                <th style="width: 100px;">启用日期</th>
                 <th >停车点</th>
                 <th style="width: 80px;" >状态</th>
-                <th style="width: 21%">操作</th>
+                <th>操作</th>
             </tr>
             <tr role="row" class="filter">
                 <td></td>
@@ -32,6 +34,36 @@
                     </div>
                 </td>
                 <td>
+                    <sa-Select5 name="gs"
+                                model="ctrl.searchCondition()"
+                                cmaps="{'cl.businessCode_eq': 'businessCode'}"
+                                dcname="cl.businessCode_eq"
+                                icname="businessCode"
+                                dsparams="{{ {type: 'ajax', param:{'upCode_eq': '88' }, atype:'gs' } | json }}"
+                                iterobjname="item"
+                                iterobjexp="item.businessName"
+                                searchph="请输拼音..."
+                                searchexp="this.businessName"
+                                required
+                    >
+                    </sa-Select5>
+                </td>
+                <td>
+                    <sa-Select5 name="fgs"
+                                model="ctrl.searchCondition()"
+                                cmaps="{'cl.brancheCompanyCode_eq': 'businessCode'}"
+                                dcname="cl.brancheCompanyCode_eq"
+                                icname="businessCode"
+                                dsparams="{{ {type: 'ajax', param:{'upCode_eq': ctrl.searchCondition()['cl.businessCode_eq'] }, atype:'gs' } | json }}"
+                                iterobjname="item"
+                                iterobjexp="item.businessName"
+                                searchph="请输拼音..."
+                                searchexp="this.businessName"
+                                required
+                    >
+                    </sa-Select5>
+                </td>
+                <td>
                     <input type="text" class="form-control form-filter input-sm" ng-model="ctrl.searchCondition()['cl.insideCode_like']" placeholder="输入内部编号..."/>
                 </td>
                 <td></td>
@@ -69,6 +101,12 @@
                     <span ng-bind="info.xl.name"></span>
                 </td>
                 <td>
+                    <span ng-bind="info.cl.company"></span>
+                </td>
+                <td>
+                    <span ng-bind="info.cl.brancheCompany"></span>
+                </td>
+                <td>
                     <span ng-bind="info.cl.insideCode"></span>
                 </td>
                 <td>