添加快证页面修改

src/main/resources/static/dialogs/confirmFailedCards.html

@@ -13,7 +13,8 @@
         <tr ng-repeat="item in personInfo">
             <td>{{$index + 1}}</td>
             <td>{{item.ID_NO}}</td>
-            <td>{{item.NAME}}</td>
+            <td ng-if="item.NAME=='查无此人'" style="color: red;">{{item.NAME}}</td>
+            <td ng-if="item.NAME!='查无此人'">{{item.NAME}}</td>
             <td ng-if="item.SEX_NO==1">男</td>
             <td ng-if="item.SEX_NO==2">女</td>
             <td ng-if="item.SEX_NO==-1">错误</td>

src/main/resources/static/dialogs/confirmRestCards.html

@@ -14,7 +14,8 @@
         <tr ng-repeat="item in personInfo">
             <td>{{$index + 1}}</td>
             <td>{{item.ID_NO}}</td>
-            <td>{{item.NAME}}</td>
+            <td ng-if="item.NAME=='查无此人'" style="color: red;">{{item.NAME}}</td>
+            <td ng-if="item.NAME!='查无此人'">{{item.NAME}}</td>
             <td ng-if="item.SEX_NO==1">男</td>
             <td ng-if="item.SEX_NO==2">女</td>
             <td ng-if="item.SEX_NO==-1">错误</td>

src/main/resources/static/dialogs/confirmTagCards.html

@@ -13,7 +13,8 @@
         <tr ng-repeat="item in personInfo">
             <td>{{$index + 1}}</td>
             <td>{{item.ID_NO}}</td>
-            <td>{{item.NAME}}</td>
+            <td ng-if="item.NAME=='查无此人'" style="color: red;">{{item.NAME}}</td>
+            <td ng-if="item.NAME!='查无此人'">{{item.NAME}}</td>
             <td ng-if="item.SEX_NO==1">男</td>
             <td ng-if="item.SEX_NO==2">女</td>
             <td ng-if="item.SEX_NO==-1">错误</td>

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

@@ -38,6 +38,7 @@ angular.module('AvatarCheck.addFailed', ['ngRoute', 'AvatarCheck.http'])
         }
 
 
+        var cancelAdd = $scope.cancelAdd;
         $scope.addFailed = function(){
             var array = [];
             for(var i=0;i<$scope.arr.length;i++){
@@ -92,6 +93,7 @@ angular.module('AvatarCheck.addFailed', ['ngRoute', 'AvatarCheck.http'])
                             HttpService.addFailedCard(list,function(data){
                                 $scope.closeThisDialog();
                                 MessageService.showAlert("添加成功");
+                                cancelAdd();
                                 console.log(data)
                             })
                         }

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

@@ -30,7 +30,7 @@ angular.module('AvatarCheck.addRest', ['ngRoute', 'AvatarCheck.http'])
         $scope.cancelAddRest =function(){
             $scope.arr = [];
         }
-
+        var cancel=$scope.cancelAddRest;
         $scope.addRest = function(){
             var array = [];
             var count = 0;
@@ -68,6 +68,7 @@ angular.module('AvatarCheck.addRest', ['ngRoute', 'AvatarCheck.http'])
                             HttpService.addRestCard(json,function(data){
                                 $scope.closeThisDialog();
                                 MessageService.showAlert("添加成功");
+                                cancel();
                                 console.log(data)
                             })
                         }

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

@@ -32,6 +32,7 @@ angular.module('AvatarCheck.addTag', ['ngRoute', 'AvatarCheck.http'])
         }
 
 
+        var cancelAdd = $scope.cancelAdd
         $scope.addTags = function(){
             var array = [];
             for(var i=0;i<$scope.arr.length;i++){
@@ -85,6 +86,7 @@ angular.module('AvatarCheck.addTag', ['ngRoute', 'AvatarCheck.http'])
                             HttpService.addTagCard(list,function(data){
                                 $scope.closeThisDialog();
                                 MessageService.showAlert("添加成功");
+                                cancelAdd();
                                 cancel();
                             })
                         }

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

@@ -26,9 +26,9 @@
 </style>
 <div class="content row">
     <div class="col-md-12" style="margin-top:20px;">
-    <div class="box box-primary">
+    <div class="box">
         <strong class="box-header with-border">解析日志</strong>
-        <div class="box-primary" style="padding: 15px;padding-top: 0;">
+        <div class="box box-primary">
             <table class="table table-bordered" style="margin-bottom: 0;">
                <tr>
                    <td>原始包名:</td>

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

@@ -23,19 +23,20 @@
                             <th>任务单流水号</th>
                             <th>区县</th>
                             <th>制证类型</th>
-                            <th>日期</th>
-                            <th>数据核验</th>
+                            <th>数量</th>
+                            <th>下发日期</th>
                             <th>膜打印</th>
                             <th>预定位</th>
+                            <th>电写入</th>
                             <th>分拣</th>
                             <th>质检</th>
-                            <th>仓库</th>
                             </thead>
                             <tbody>
                             <tr ng-repeat="item in searchResult.workOrderData">
                                 <td>{{item.TASK_ID}}</td>
                                 <td>{{item.COUNTYNAME}}</td>
                                 <td>{{item.CARD_TYPE}}</td>
+                                <td>{{item.VALID_COUNT}}</td>
                                 <td>{{item.SUBMIT_DATE | date:'yyyy-MM-dd HH:mm:ss'}}</td>
                                 <td>{{item.ISSUED_DATE | date:'yyyy-MM-dd HH:mm:ss'}}</td>
                                 <td>{{item.PRINT_OUT_DATE | date:'yyyy-MM-dd HH:mm:ss'}}</td>