PSM-12

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