新增页面

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

@@ -342,6 +342,9 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
                 if(angular.isUndefined(county)){
                     county = -1;
                 }
+                if(date==""){
+                    date=$filter("date")(new Date(), "yyyy-MM-dd");
+                }
                 console.log(newPackageName,idCard,date,county)
                 $http({
                     method: 'GET',
@@ -366,6 +369,9 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
                 if(angular.isUndefined(county)){
                     county = -1;
                 }
+                if(date==""){
+                    date=$filter("date")(new Date(), "yyyy-MM-dd");
+                }
                 console.log(newPackageName,idCard,date,county)
                 $http({
                     method: 'GET',

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

@@ -148,10 +148,11 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
             var checks = document.getElementsByClassName("checkOneBox");
             for (var i=0;i<checks.length;i++){
                 if (checks[i].checked) {
-                    sum += parseInt(checks[i].value);
+                    sum += parseInt(checks[i].name);
                 }
             }
             $rootScope.cardsTotal = $rootScope.cardsTotal + sum - temp;
+            $scope.restCount=$rootScope.cardsTotal%8;
             temp = sum;
 
         };
@@ -169,22 +170,21 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
                 var sum = 0;
                 var checks = document.getElementsByClassName("checkOneBox");
                 for (var i = 0; i < checks.length; i++) {
-                    sum += parseInt(checks[i].value);
+                    sum += parseInt(checks[i].name);
                 }
                 $rootScope.cardsTotal = $rootScope.cardsTotal + sum - temp;
+                $scope.restCount=$rootScope.cardsTotal%8;
                 temp = sum;
 
             }else{
                 $rootScope.cardsTotal =0;
+                $scope.restCount=0
                 temp = 0;
             }
         };
         $scope.isSelected = function (task) {
             return $scope.selected.indexOf(task) >= 0;
         };
-        $scope.isSelectedAll = function (index) {
-            return $scope.selected.length === $scope.cycleSheetData[index].countyList.length > 0;
-        };
 
         $scope.currentTab = 0;
         $scope.func = function (index) {

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

@@ -28,8 +28,8 @@
                       </a>
                   </li>
                    <li class="pull-right" style="padding-right: 20px;">
-                        <h5>任务总数:8001</h5>
-                        <h4>余证数:1</h4>
+                        <h5>任务总数:{{cardsTotal}}</h5>
+                        <h4>余证数:{{restCount}}</h4>
                     </li>
                 </ul>
               </div>
@@ -43,22 +43,24 @@
                     <th>地区</th>
                     <th>组数</th>
                     <th>组号</th>
-                    <th>数据核验数量</th>
-                    <th>电写入数量</th>
+                    <th>核验数量</th>
+                    <th>证件数量</th>
+                    <th>特殊证件数量</th>
                     <th>废证数量</th>
                     <th></th>
                 </tr>
               </thead>
               <tbody>
               <tr ng-repeat="task in type.countyList">
-                <td><input type="checkbox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.taskId}}" ng-click="updateSelection($event,task)"></td>
+                <td><input type="checkbox" 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.checkDate}}</td>
+                <td class="mailbox-subject">{{task.saveDate}}</td>
                 <td class="mailbox-subject"><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.dataCheckCount}}</td>
-                <td class="mailbox-attachment">{{task.electricCount}}</td>
+                <td class="mailbox-subject">{{task.countyValidCount}}</td>
+                <td class="mailbox-subject">{{task.countyValidCount-task.specialCount}}</td>
+                <td class="mailbox-attachment">{{task.specialCount}}</td>
                 <td ng-if="task.faileCount!=0" class="mailbox-subject" style="color: red;">{{task.faileCount}}</td>
                 <td ng-if="task.faileCount==0" class="mailbox-subject">{{task.faileCount}}</td>
                 <td class="mailbox-date"><a ng-click="getPoliceList(task.taskId)">组号列表</a></td>