详单添加备注

src/main/resources/static/js/service.js

@@ -619,6 +619,7 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
             },
             addRestCard:function(data,success) {
                 var body = JSON.stringify(data);
+                console.log(body)
                 $http({
                     method: 'POST',
                     url: "../FailedCardApi/insertRemaining",

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

@@ -160,13 +160,19 @@ angular.module('AvatarCheck.dispatchTask', ['ngRoute', 'AvatarCheck.http', 'tm.p
             var checks = $(".checkOneBox:checked");
             if(checks.length>0){
                 var arr = [];
+                var failedArr = [];
                 for (var i=0;i<checks.length;i++){
+                    if(checks[i].value.length<11){
+                        failedArr.push(checks[i].value)
+                    }else {
                         arr.push(checks[i].value)
                     }
+                }
                 var json={
                     process:$rootScope.loginData.roleList[0].process,
                     name:$rootScope.loginData.name,
-                    taskIdList:arr
+                    taskIdList:arr,
+                    failedList:failedArr
                 }
                 console.log(json)
                 HttpService.updateTaskListProcess(json,function(data){

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

@@ -76,6 +76,8 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
             })
         }
 
+        $rootScope.cardsTotal=0;
+        $scope.restCount=0;
         //TODO 需要保证有废证的任务单不能下发
         //创建变量用来保存选中结果
         $scope.selected = [];
@@ -179,11 +181,12 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
             var checks = $("#checkOneBox:checked");
             if(checks.length>0){
                 var arr = [];
+                var failedArr=[];
                 for (var i=0;i<checks.length;i++){
-                    if(!checks[i].disabled){
-                        arr.push(checks[i].value)
+                    if(checks[i].value.length<11){
+                        failedArr.push(checks[i].value)
                     }else{
-                        continue;
+                        arr.push(checks[i].value)
                     }
                 }
 
@@ -191,7 +194,8 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
                     process:$rootScope.loginData.roleList[0].process,
                     name:$rootScope.loginData.name,
                     printer:$("#print").val(),
-                    taskIdList:arr
+                    taskIdList:arr,
+                    failedList:failedArr
                 }
                 console.log(json)
                 HttpService.updatePrintTaskListProcess(json,function(data){
@@ -333,18 +337,20 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
         $scope.goes = function(){
             var checks = $(".checkOneBox:checked");
             var arr = [];
+            var failedArr=[];
             for (var i=0;i<checks.length;i++){
-                if(!checks[i].disabled){
-                    arr.push(checks[i].value)
+                if(checks[i].value.length<11){
+                    failedArr.push(checks[i].value)
                 }else{
-                    continue;
+                    arr.push(checks[i].value)
                 }
             }
             if(arr.length>0){
                 var json={
                     process:$rootScope.loginData.roleList[0].process,
                     name:$rootScope.loginData.name,
-                    taskIdList:arr
+                    taskIdList:arr,
+                    failedList:failedArr
                 }
                 console.log(json)
                 HttpService.updateTaskListProcess(json,function(data){
@@ -479,17 +485,19 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
             var checks = $(".checkOneBox:checked");
             if(checks.length>0){
                 var arr = [];
+                var failedArr=[];
                 for (var i=0;i<checks.length;i++){
-                    if(!checks[i].disabled){
-                        arr.push(checks[i].value)
+                    if(checks[i].value.length<11){
+                        failedArr.push(checks[i].value)
                     }else{
-                        continue;
+                        arr.push(checks[i].value);
                     }
                 }
                 var json={
                     process:$rootScope.loginData.roleList[0].process,
                     name:$rootScope.loginData.name,
-                    taskIdList:arr
+                    taskIdList:arr,
+                    failedList:failedArr
                 }
                 console.log(json)
                 HttpService.updateTaskListProcess(json,function(data){
@@ -622,17 +630,19 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
             var checks = $(".checkOneBox:checked");
             if(checks.length>0){
                 var arr = [];
+                var failedArr=[];
                 for (var i=0;i<checks.length;i++){
-                    if(!checks[i].disabled){
-                        arr.push(checks[i].value)
+                    if(checks[i].value.length<11){
+                        failedArr.push(checks[i].value)
                     }else{
-                        continue;
+                        arr.push(checks[i].value)
                     }
                 }
                 var json={
                     process:$rootScope.loginData.roleList[0].process,
                     name:$rootScope.loginData.name,
-                    taskIdList:arr
+                    taskIdList:arr,
+                    failedList:failedArr
                 }
                 console.log(json)
                 HttpService.updateTaskListProcess(json,function(data){

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

@@ -37,7 +37,7 @@
                 <table class="table table-hover table-striped">
                   <thead>
                     <tr>
-                        <th><input type="checkbox" ng-click="selectAll(type.countyList,type.typeCode,$event)" ng-checked="isSelectedAll($index)"></th>
+                        <th><input type="checkbox" ng-click="selectAll(type.countyList,$event)" ng-checked="isSelectedAll($index)"></th>
                         <th>任务单编号</th>
                         <th>核验日期</th>
                         <th>地区</th>
@@ -52,7 +52,7 @@
                   </thead>
                   <tbody ng-repeat="task in type.countyList">
                   <tr>
-                    <td ng-if="task.faileCount==0"><input type="checkbox" id="checkOneBox" class="checkOneBox{{type.typeCode}}" ng-checked="isSelected(task)" value="{{task.taskId}}" name="{{task.countyValidCount-task.specialCount}}"  ng-click="updateSelection($event,task)"></td>
+                    <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 class="mailbox-star"><b>{{task.taskId}}</b></td>
                     <td class="mailbox-subject">{{task.saveDate | date:'yyyy-MM-dd'}}</td>
                     <td class="mailbox-subject"><a>{{task.countyName}}</a></td>