任务单排序

src/main/resources/static/views/createTaskList/createTaskList.html

@@ -61,15 +61,15 @@
                         <tr>
                             <th><input type="checkbox" ng-click="selectAll(type.countyList,$event)" ng-checked="isSelectedAll($index)"></th>
                             <th>保存日期</th>
-                            <th>地区</th>
+                            <th><a ng-click="countyCode='countyCode';desc=!desc">地区</a></th>
                             <th>组数</th>
-                            <th>受理组号</th>
+                            <th><a ng-click="countyCode='groupNum';desc=!desc">受理组号</a></th>
                             <th>合格数量</th>
                             <th>不合格数量</th>
                             <th></th>
                         </tr>
                       </thead>
-                      <tbody ng-repeat="task in type.countyList">
+                      <tbody ng-repeat="task in type.countyList| orderBy:countyCode:desc">
                       <tr>
                         <td><input type="checkbox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.valid}}" ng-click="updateSelection($event,task)"></td>
                         <td class="mailbox-star"><b>{{task.saveDate | date:'yyyy-MM-dd'}}</b></td>

src/main/resources/static/views/createTaskList/createTaskList.js

@@ -11,6 +11,10 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm
 
     .controller('createTaskListCtrl', function ($scope, $rootScope, HttpService, $interval, MessageService, $timeout, $filter, ngDialog) {
 
+        $scope.desc = 0;
+        $scope.countyCode = "countyCode";
+
+
         //Date picker
         $('#datepicker').datetimepicker({
             minView: "month", //选择日期后，不会再跳转去选择时分秒

src/main/resources/static/views/dispatchTask/dispatchTask.html

@@ -34,10 +34,10 @@
               <thead>
                 <tr>
                     <th><input type="checkbox" ng-click="selectAll(type.countyList,$event)" ng-checked="isSelectedAll($index)"></th>
-                    <th>任务单编号</th>
-                    <th>地区</th>
+                    <th><a ng-click="countyCode='taskId';desc=!desc">任务单编号</a></th>
+                    <th><a ng-click="countyCode='countyCode';desc=!desc">地区</a></th>
                     <th>组数</th>
-                    <th>受理组号</th>
+                    <th><a ng-click="countyCode='groupNum';desc=!desc">受理组号</a></th>
                     <th>合格数量</th>
                     <th>不合格数量</th>
                     <th>废证数量</th>
@@ -45,7 +45,7 @@
                     <th></th>
                 </tr>
               </thead>
-              <tbody ng-repeat="task in type.countyList">
+              <tbody ng-repeat="task in type.countyList| orderBy:countyCode:desc">
               <tr>
                 <td><input type="checkbox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.taskId}}" ng-click="updateSelection($event,task)"></td>
                 <td class="mailbox-star"><b>{{task.taskId}}</b></td>

src/main/resources/static/views/dispatchTask/dispatchTask.js

@@ -11,6 +11,8 @@ angular.module('AvatarCheck.dispatchTask', ['ngRoute', 'AvatarCheck.http', 'tm.p
 
     .controller('dispatchTaskCtrl', function ($scope, $rootScope, HttpService, $interval, MessageService, $timeout, $filter, ngDialog) {
 
+        $scope.desc = 0;
+        $scope.countyCode = "countyCode";
         //Date picker
         $('#datepicker').datetimepicker({
             minView: "month", //选择日期后，不会再跳转去选择时分秒

src/main/resources/static/views/task/task.js

@@ -31,7 +31,8 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
 
     .controller('taskListPrintCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) {
 
-
+        $scope.desc = 0;
+        $scope.countyCode = "countyCode";
         //Date picker
         $('#datepicker').datetimepicker({
             minView: "month", //选择日期后，不会再跳转去选择时分秒
@@ -213,7 +214,8 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
     })
     .controller('taskListPreLocatingCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) {
 
-
+        $scope.desc = 0;
+        $scope.countyCode = "countyCode";
 
         //Date picker
         $('#datepicker').datetimepicker({
@@ -367,6 +369,8 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
     })
     .controller('taskListEwritingCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) {
 
+        $scope.desc = 0;
+        $scope.countyCode = "countyCode";
         //Date picker
         $('#datepicker').datetimepicker({
             minView: "month", //选择日期后，不会再跳转去选择时分秒
@@ -512,6 +516,8 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
     })
     .controller('taskListSortingCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) {
 
+        $scope.desc = 0;
+        $scope.countyCode = "countyCode";
         //Date picker
         $('#datepicker').datetimepicker({
             minView: "month", //选择日期后，不会再跳转去选择时分秒

src/main/resources/static/views/task/taskListEwriting.html

@@ -34,11 +34,11 @@
                <thead>
                  <tr>
                      <th><input type="checkbox" ng-click="selectAll(type.countyList,$event)" ng-checked="isSelectedAll($index)"></th>
-                     <th>任务单编号</th>
+                     <th><a ng-click="countyCode='taskId';desc=!desc">任务单编号</a></th>
                      <th>核验日期</th>
-                     <th>地区</th>
+                     <th><a ng-click="countyCode='countyCode';desc=!desc">地区</a></th>
                      <th>组数</th>
-                     <th>组号</th>
+                     <th><a ng-click="countyCode='groupNum';desc=!desc">受理组号</a></th>
                      <th>核验数量</th>
                      <th>证件数量</th>
                      <th>电写入数量</th>
@@ -47,7 +47,7 @@
                      <th></th>
                  </tr>
                </thead>
-               <tbody ng-repeat="task in type.countyList">
+               <tbody ng-repeat="task in type.countyList | orderBy:countyCode:desc">
                      <tr>
                        <td ng-if="task.faileCount==0"><input type="checkbox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.taskId}}" ng-click="updateSelection($event,task)"></td>
                        <td ng-if="task.faileCount>0"></td>

src/main/resources/static/views/task/taskListPreLocating.html

@@ -37,11 +37,11 @@
               <thead>
                 <tr>
                     <th><input type="checkbox" ng-click="selectAll(type.countyList,$event)" ng-checked="isSelectedAll($index)"></th>
-                    <th>任务单编号</th>
+                    <th><a ng-click="countyCode='taskId';desc=!desc">任务单编号</a></th>
                     <th>核验日期</th>
-                    <th>地区</th>
+                    <th><a ng-click="countyCode='countyCode';desc=!desc">地区</a></th>
                     <th>组数</th>
-                    <th>组号</th>
+                    <th><a ng-click="countyCode='groupNum';desc=!desc">受理组号</a></th>
                     <th>核验数量</th>
                     <th>证件数量</th>
                     <th>特殊证件数量</th>

src/main/resources/static/views/task/taskListPrint.html

@@ -38,11 +38,11 @@
                   <thead>
                     <tr>
                         <th><input type="checkbox" ng-click="selectAll(type.countyList,$event)" ng-checked="isSelectedAll($index)"></th>
-                        <th>任务单编号</th>
+                        <th><a ng-click="countyCode='taskId';desc=!desc">任务单编号</a></th>
                         <th>核验日期</th>
-                        <th>地区</th>
+                        <th><a ng-click="countyCode='countyCode';desc=!desc">地区</a></th>
                         <th>组数</th>
-                        <th>组号</th>
+                        <th><a ng-click="countyCode='groupNum';desc=!desc">受理组号</a></th>
                         <th>核验数量</th>
                         <th>证件数量</th>
                         <th>特殊证件数量</th>
@@ -50,7 +50,7 @@
                         <th></th>
                     </tr>
                   </thead>
-                  <tbody ng-repeat="task in type.countyList">
+                  <tbody ng-repeat="task in type.countyList | orderBy:countyCode:desc">
                   <tr>
                     <td ng-if="task.faileCount==0"><input type="checkbox" id="checkOneBox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.taskId}}" name="{{task.countyValidCount-task.specialCount}}"  ng-click="updateSelection($event,task)"></td>
                     <td ng-if="task.faileCount>0"></td>

src/main/resources/static/views/task/taskListPushing.html

@@ -37,11 +37,11 @@
                   <thead>
                       <tr>
                           <th><input type="checkbox" ng-click="selectAll(type.countyList,$event)" ng-checked="isSelectedAll($index)"></th>
-                          <th>任务单编号</th>
+                          <th><a ng-click="countyCode='taskId';desc=!desc">任务单编号</a></th>
                           <th>核验日期</th>
-                          <th>地区</th>
+                          <th><a ng-click="countyCode='countyCode';desc=!desc">地区</a></th>
                           <th>组数</th>
-                          <th>组号</th>
+                          <th><a ng-click="countyCode='groupNum';desc=!desc">受理组号</a></th>
                           <th>核验数量</th>
                           <th>证件数量</th>
                           <th>特殊证件数量</th>
@@ -49,7 +49,7 @@
                           <th></th>
                       </tr>
                     </thead>
-                    <tbody ng-repeat="task in type.countyList">
+                    <tbody ng-repeat="task in type.countyList| orderBy:countyCode:desc">
                       <tr>
                         <td ng-if="task.faileCount==0"><input type="checkbox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.taskId}}"   ng-click="updateSelection($event,task)"></td>
                         <td ng-if="task.faileCount>0"></td>

src/main/resources/static/views/task/taskListSorting.html

@@ -32,11 +32,11 @@
                   <thead>
                     <tr>
                         <th><input type="checkbox" ng-click="selectAll(type.countyList,$event)" ng-checked="isSelectedAll($index)"></th>
-                        <th>任务单编号</th>
+                        <th><a ng-click="countyCode='taskId';desc=!desc">任务单编号</a></th>
                         <th>核验日期</th>
-                        <th>地区</th>
+                        <th><a ng-click="countyCode='countyCode';desc=!desc">地区</a></th>
                         <th>组数</th>
-                        <th>组号</th>
+                        <th><a ng-click="countyCode='groupNum';desc=!desc">受理组号</a></th>
                         <th>核验数量</th>
                         <th>证件数量</th>
                         <th>电写入数量</th>
@@ -47,7 +47,7 @@
                         <th></th>
                     </tr>
                   </thead>
-                  <tbody ng-repeat="task in type.countyList">
+                  <tbody ng-repeat="task in type.countyList | orderBy:countyCode:desc">
                   <tr>
                     <td ng-if="task.faileCount==0"><input type="checkbox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.taskId}}" ng-click="updateSelection($event,task)"></td>
                     <td ng-if="task.faileCount>0"></td>