潘钊 / bsth_control · Commits

Commit 499f236cb878a0b732c28a1ae3291107c6d0ab14

Authored by 徐烜
1 parent 53e4eebf
build: skipped

PSM-12

Inline Side-by-side
Showing 8 changed files with 54 additions and 11 deletions
src/main/resources/static/pages/scheduleApp/module/core/busConfig/list.html
  View file @499f236
... ... @@ -10,6 +10,7 @@
10 10 <th style="width: 150px;">启用日期</th>
11 11 <th style="width: 150px;">终止日期</th>
12 12 <th >停车点</th>
  13 + <th style="width: 80px;" >状态</th>
13 14 <th style="width: 21%">操作</th>
14 15 </tr>
15 16 <tr role="row" class="filter">
... ... @@ -34,6 +35,11 @@
34 35 <td></td>
35 36 <td></td>
36 37 <td>
  38 + <label class="checkbox-inline input">
  39 + <input type="checkbox" ng-model="ctrl.searchCondition()['isCancel_eq']" />作废
  40 + </label>
  41 + </td>
  42 + <td>
37 43 <button class="btn btn-sm green btn-outline filter-submit margin-bottom"
38 44 ng-click="ctrl.pageChanaged()">
39 45 <i class="fa fa-search"></i> 搜索</button>
... ... @@ -67,6 +73,10 @@
67 73 <span ng-bind="info.tcd"></span>
68 74 </td>
69 75 <td>
  76 + <span class="glyphicon glyphicon-ok" ng-if="info.isCancel == '0'"></span>
  77 + <span class="glyphicon glyphicon-remove" ng-if="info.isCancel == '1'"></span>
  78 + </td>
  79 + <td>
70 80 <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>-->
71 81 <!--<a href="edit.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 修改 </a>-->
72 82 <a ui-sref="busConfig_detail({id: info.id})" class="btn btn-info btn-sm"> 详细 </a>
... ...
src/main/resources/static/pages/scheduleApp/module/core/busConfig/module.js
  View file @499f236
1 1 // 车辆配置管理 service controller 等写在一起
2 2 angular.module('ScheduleApp').factory('BusConfigService', ['BusConfigService_g', function(service) {
3 3 /** 当前的查询条件信息 */
4   - var currentSearchCondition = {};
  4 + var currentSearchCondition = {'isCancel_eq': false};
5 5  
6 6 /** 当前第几页 */
7 7 var currentPageNo = 1;
... ... @@ -22,6 +22,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;BusConfigService&#39;, [&#39;BusConfigService_g&#39;,
22 22 for (key in currentSearchCondition) {
23 23 currentSearchCondition[key] = undefined;
24 24 }
  25 + currentSearchCondition['isCancel_eq'] = false;
25 26 },
26 27 /**
27 28 * 设置当前页码。
... ...
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/list.html
  View file @499f236
... ... @@ -11,6 +11,7 @@
11 11 <th style="width: 15%;">驾驶员</th>
12 12 <th >售票员工号</th>
13 13 <th >售票员</th>
  14 + <th style="width: 80px;">状态</th>
14 15 <th style="width: 21%">操作</th>
15 16 </tr>
16 17 <tr role="row" class="filter">
... ... @@ -44,6 +45,11 @@
44 45 <input type="text" class="form-control form-filter input-sm" ng-model="ctrl.searchCondition()['spy.personnelName_like']" placeholder="输入姓名..."/>
45 46 </td>
46 47 <td>
  48 + <label class="checkbox-inline">
  49 + <input type="checkbox" ng-model="ctrl.searchCondition()['isCancel_eq']"/>作废
  50 + </label>
  51 + </td>
  52 + <td>
47 53 <button class="btn btn-sm green btn-outline filter-submit margin-bottom"
48 54 ng-click="ctrl.pageChanaged()">
49 55 <i class="fa fa-search"></i> 搜索</button>
... ... @@ -80,6 +86,10 @@
80 86 <span ng-bind="info.spy.personnelName"></span>
81 87 </td>
82 88 <td>
  89 + <span class="glyphicon glyphicon-ok" ng-if="info.isCancel == '0'"></span>
  90 + <span class="glyphicon glyphicon-remove" ng-if="info.isCancel == '1'"></span>
  91 + </td>
  92 + <td>
83 93 <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>-->
84 94 <!--<a href="edit.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 修改 </a>-->
85 95 <a ui-sref="employeeConfig_detail({id: info.id})" class="btn btn-info btn-sm"> 详细 </a>
... ...
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/module.js
  View file @499f236
... ... @@ -2,7 +2,7 @@
2 2  
3 3 angular.module('ScheduleApp').factory('EmployeeConfigService', ['EmployeeConfigService_g', function(service) {
4 4 /** 当前的查询条件信息 */
5   - var currentSearchCondition = {};
  5 + var currentSearchCondition = {'isCancel_eq': false};
6 6  
7 7 /** 当前第几页 */
8 8 var currentPageNo = 1;
... ... @@ -23,6 +23,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;EmployeeConfigService&#39;, [&#39;EmployeeConfigS
23 23 for (key in currentSearchCondition) {
24 24 currentSearchCondition[key] = undefined;
25 25 }
  26 + currentSearchCondition['isCancel_eq'] = false;
26 27 },
27 28 /**
28 29 * 设置当前页码。
... ...
src/main/resources/static/pages/scheduleApp/module/core/rerunManage/list.html
  View file @499f236
... ... @@ -3,14 +3,15 @@
3 3 <table class="fixTable table table-striped table-bordered table-hover table-checkable order-column">
4 4 <thead>
5 5 <tr role="row" class="heading">
6   - <th style="width: 5%;">序号</th>
7   - <th style="width: 15%;">套跑线路</th>
8   - <th style="width: 100px">套跑路牌</th>
9   - <th style="width: 10%;">时刻表</th>
10   - <th style="width: 10%;">线路</th>
11   - <th style="width: 100px">路牌</th>
  6 + <th style="width: 50px;">序号</th>
  7 + <th style="width: 150px;">套跑线路</th>
  8 + <th style="width: 80px">套跑路牌</th>
  9 + <th >时刻表</th>
  10 + <th style="width: 150px;">线路</th>
  11 + <th style="width: 50px">路牌</th>
12 12 <th width="100px">车辆</th>
13 13 <th width="100px">套跑类型</th>
  14 + <th width="80px">状态</th>
14 15 <th style="width: 21%">操作</th>
15 16 </tr>
16 17 <tr role="row" class="filter">
... ... @@ -33,6 +34,11 @@
33 34 <td></td>
34 35 <td></td>
35 36 <td>
  37 + <label class="checkbox-inline">
  38 + <input type="checkbox" ng-model="ctrl.searchCondition()['isCancel_eq']"/>作废
  39 + </label>
  40 + </td>
  41 + <td>
36 42 <button class="btn btn-sm green btn-outline filter-submit margin-bottom"
37 43 ng-click="ctrl.pageChanaged()">
38 44 <i class="fa fa-search"></i> 搜索</button>
... ... @@ -70,6 +76,10 @@
70 76 <td>
71 77 <span ng-bind="info.rerunType | dict:'rerunType':'未知' "></span>
72 78 </td>
  79 + <td>
  80 + <span class="glyphicon glyphicon-ok" ng-if="info.isCancel == '0'"></span>
  81 + <span class="glyphicon glyphicon-remove" ng-if="info.isCancel == '1'"></span>
  82 + </td>
73 83  
74 84 <td>
75 85 <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>-->
... ...
src/main/resources/static/pages/scheduleApp/module/core/rerunManage/module.js
  View file @499f236
1 1 // 规则配置管理 service controller 等写在一起
2 2 angular.module('ScheduleApp').factory('RerunManageService', ['rerunManageService_g', function(service) {
3 3 /** 当前的查询条件信息 */
4   - var currentSearchCondition = {};
  4 + var currentSearchCondition = {'isCancel_eq': false};
5 5  
6 6 /** 当前第几页 */
7 7 var currentPageNo = 1;
... ... @@ -22,6 +22,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;RerunManageService&#39;, [&#39;rerunManageService
22 22 for (key in currentSearchCondition) {
23 23 currentSearchCondition[key] = undefined;
24 24 }
  25 + currentSearchCondition['isCancel_eq'] = false;
25 26 },
26 27 /**
27 28 * 设置当前页码。
... ...
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/list.html
  View file @499f236
... ... @@ -11,6 +11,7 @@
11 11 <th style="width: 80px">上下行</th>
12 12 <th style="width: 50px;">启用</th>
13 13 <th style="width: 120px">启用日期</th>
  14 + <th style="width: 80px">状态</th>
14 15 <th style="width: 50%">时刻表明细</th>
15 16 <th style="width: 50%">操作</th>
16 17 </tr>
... ... @@ -34,6 +35,11 @@
34 35 <td></td>
35 36 <td></td>
36 37 <td></td>
  38 + <td>
  39 + <label class="checkbox-inline">
  40 + <input type="checkbox" ng-model="ctrl.searchCondition()['isCancel_eq']"/>作废
  41 + </label>
  42 + </td>
37 43 <td></td>
38 44 <td>
39 45 <button class="btn btn-sm green btn-outline filter-submit margin-bottom"
... ... @@ -73,6 +79,10 @@
73 79 <span ng-bind="info.qyrq | date: 'yyyy-MM-dd'"></span>
74 80 </td>
75 81 <td>
  82 + <span class="glyphicon glyphicon-ok" ng-if="info.isCancel == '0'"></span>
  83 + <span class="glyphicon glyphicon-remove" ng-if="info.isCancel == '1'"></span>
  84 + </td>
  85 + <td>
76 86 <a ui-sref="ttInfoDetailManage_edit({xlid: info.xl.id, ttid : info.id, xlname: info.xl.name, ttname : info.name})"
77 87 class="btn btn-info btn-sm" ng-if="info.isCancel == '0'"> 编辑 </a>
78 88 <a ng-click="ctrl.toTtInfoDetailAuto()"
... ...
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/module.js
  View file @499f236
... ... @@ -6,7 +6,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(
6 6 'TimeTableDetailManageService_g',
7 7 function(service, dservice) {
8 8 // 当前查询的内容条件搜索对象
9   - var currentSearchCondition = {page: 0};
  9 + var currentSearchCondition = {page: 0, 'isCancel_eq': false};
10 10 // 当前查询返回的信息
11 11 var currentPage = { // 后台spring data返回的格式
12 12 totalElements: 0,
... ... @@ -36,7 +36,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(
36 36 return currentPage;
37 37 },
38 38 resetStatus: function() {
39   - currentSearchCondition = {page: 0};
  39 + currentSearchCondition = {page: 0, 'isCancel_eq': false};
40 40 currentPage = {
41 41 totalElements: 0,
42 42 number: 0,
... ...