Merge remote-tracking branch 'origin/dev' into dev

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

@@ -64,29 +64,25 @@
                             <th><a ng-click="countyCode='countyCode';desc=!desc">地区</a></th>
                             <th>组数</th>
                             <th><a ng-click="countyCode='groupNum';desc=!desc">受理组号</a></th>
-                            <th>证件数量</th>
                             <th>合格数量</th>
                             <th>不合格数量</th>
-                            <th>特殊证件数量</th>
                             <th>状态</th>
                             <th></th>
                         </tr>
                       </thead>
                       <tbody ng-repeat="task in type.countyList| orderBy:countyCode:desc">
                       <tr>
-                        <td ng-if="task.DEAL_FLAG==3"><input type="checkbox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.valid}}" ng-click="updateSelection($event,task)"></td>
-                        <td ng-if="task.DEAL_FLAG!=3"></td>
+                        <td ng-if="task.dealFlag==3"><input type="checkbox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.valid}}" ng-click="updateSelection($event,task)"></td>
+                        <td ng-if="task.dealFlag!=3"></td>
                         <td class="mailbox-star"><b>{{task.saveDate | date:'yyyy-MM-dd'}}</b></td>
                         <td class="mailbox-name"><a>{{task.countyName}}</a></td>
                         <td class="mailbox-subject">{{task.groupList.length}}</td>
                         <td class="mailbox-subject">{{task.groupNum}}</td>
-                        <td class="mailbox-subject">{{task.countyValidCount-task.specialCount}}</td>
                         <td class="mailbox-attachment">{{task.countyValidCount}}</td>
                         <td class="mailbox-date">{{task.countyInvalidCount}}</td>
-                        <td class="mailbox-date">{{task.specialCount}}</td>
-                        <td ng-if="task.DEAL_FLAG==0" style="color: #9f191f">未处理</td>
-                        <td ng-if="task.DEAL_FLAG==1||groups.DEAL_FLAG==2" style="color: #0b93d5">处理中</td>
-                        <td ng-if="task.DEAL_FLAG==3">可以转出</td>
+                        <td ng-if="task.dealFlag==0" style="color: #9f191f">未处理</td>
+                        <td ng-if="task.dealFlag==1||groups.DEAL_FLAG==2" style="color: #0b93d5">处理中</td>
+                        <td ng-if="task.dealFlag==3">可以转出</td>
                         <td class="mailbox-date"><a ng-click="getPoliceList(task.groupList)">组号列表</a></td>
                       </tr>
                       </tbody>
@@ -125,10 +121,11 @@
                                 <th>保存日期</th>
                                 <th>地区</th>
                                 <th>组数</th>
-                                <th>证件数量</th>
                                 <th>受理组号</th>
+                                <th>证件数量</th>
                                 <th>合格数量</th>
                                 <th>不合格数量</th>
+                                <th>特殊证件数量</th>
                                 <th></th>
                             </tr>
                           </thead>
@@ -137,11 +134,12 @@
                             <td class="mailbox-star"><b>{{task.saveDate | date:'yyyy-MM-dd'}}</b></td>
                             <td class="mailbox-name"><a>{{task.countyName}}</a></td>
                             <td class="mailbox-subject">{{task.groupList.length}}</td>
-                            <td class="mailbox-subject">{{task.countyValidCount-task.specialCount}}</td>
                             <td class="mailbox-subject">{{task.groupNum}}</td>
+                            <td class="mailbox-subject">{{task.countyValidCount-task.specialCount}}</td>
                             <td class="mailbox-attachment">{{task.countyValidCount}}</td>
                             <td class="mailbox-date">{{task.countyInvalidCount}}</td>
-                            <td class="mailbox-date"><a ng-click="getPoliceList(task.countyCode,type.typeCode)">组号列表</a></td>
+                            <td class="mailbox-date">{{task.specialCount}}</td>
+                            <td class="mailbox-date"><a ng-click="getPoliceList(task.groupList)">组号列表</a></td>
                           </tr>
                           </tbody>
                         </table>

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

@@ -246,6 +246,7 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm
                 cache: false,
                 closeByDocument:false,
                 controller: ['$scope', 'HttpService',function ($scope) {
+                    $scope.closeThisDialog();
                     $scope.confirmGoTo = go;
                 }]
             })

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

@@ -193,6 +193,7 @@ angular.module('AvatarCheck.dispatchTask', ['ngRoute', 'AvatarCheck.http', 'tm.p
                 cache: false,
                 closeByDocument:false,
                 controller: ['$scope', 'HttpService',function ($scope) {
+                    $scope.closeThisDialog();
                     $scope.confirmGoTo = go;
                 }]
             })

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

@@ -402,6 +402,7 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
                 cache: false,
                 closeByDocument:false,
                 controller: ['$scope', 'HttpService',function ($scope) {
+                    $scope.closeThisDialog();
                     $scope.confirmGoTo = go;
                 }]
             })
@@ -584,6 +585,7 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
                 cache: false,
                 closeByDocument:false,
                 controller: ['$scope', 'HttpService',function ($scope) {
+                    $scope.closeThisDialog();
                     $scope.confirmGoTo = go;
                 }]
             })
@@ -763,6 +765,7 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
                 cache: false,
                 closeByDocument:false,
                 controller: ['$scope', 'HttpService',function ($scope) {
+                    $scope.closeThisDialog();
                     $scope.confirmGoTo = go;
                 }]
             })

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

@@ -38,7 +38,7 @@
                     <td><input type="text" class="form-control" ng-model="applicantName" placeholder="申请人姓名"></td>
                     <td>订单号:</td>
                     <td><input type="text" class="form-control" ng-model="orderNo" placeholder="订单号"></td>
-                    <td>序号:</td>
+                    <td>邮件号:</td>
                     <td><input type="text" class="form-control"  ng-model="emailNo" placeholder="邮件号"></td>
                </tr>
                <tr>