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

src/main/java/com/yxproject/start/api/TaskListApi.java

@@ -420,6 +420,61 @@ public class TaskListApi {
     }
 
 
+    /**
+     *
+     * @param date
+     * @param state
+     * @return
+     */
+    @RequestMapping("selectCountHistory")
+    public int selectCountHistory(@RequestParam("date")String date,@RequestParam("state")String state){
+        int count=0;
+        int count1;
+        int count2;
+        switch (state){
+            case "1":
+                 count1= Integer.parseInt(taskListService.selectCountIssue(date));
+                 count2= Integer.parseInt(taskListService.selectCountIssue2(date));
+                 count = count1+count2;
+                return count;
+
+            case "2":
+                 count1 =Integer.parseInt(taskListService.selectCountPrintOut(date));
+                 count2=Integer.parseInt(taskListService.selectCountPrintOut2(date));
+                 count = count1+count2;
+                 return count;
+            case "3":
+                count1=Integer.parseInt(taskListService.selectCountPosition(date));
+                count2=Integer.parseInt(taskListService.selectCountPosition2(date));
+                count = count1+count2;
+                return count;
+            case "4":
+                count1 = Integer.parseInt(taskListService.selectCountConcora(date));
+                count2= Integer.parseInt(taskListService.selectCountConcora2(date));
+                count = count1+count2;
+                return count;
+            case "5":
+                count1 =Integer.parseInt(taskListService.selectCountPunching(date));
+                count2=Integer.parseInt(taskListService.selectCountPunching2(date));
+                count = count1+count2;
+                return count;
+            case "6":
+                count1=Integer.parseInt(taskListService.selectCountSorting(date));
+                count2=Integer.parseInt(taskListService.selectCountSorting2(date));
+                count =count1+count2;
+                return count;
+            case "7":
+                count1=Integer.parseInt(taskListService.selectCountQuality(date));
+                count2=Integer.parseInt(taskListService.selectCountQuality2(date));
+                count=count1+count2;
+                return count;
+        }
+        return count;
+    }
+
+
+
+
     /**
      * 去除字符串中中线
      *
@@ -430,4 +485,11 @@ public class TaskListApi {
         return str.replace("-", "");
     }
 
+
+
+
+
+
+
+
 }

src/main/java/com/yxproject/start/mapper/LogMapper.java

@@ -22,11 +22,6 @@ public interface LogMapper {
     public List<Map<String,Object>> selectAnalysisData(@Param("uploadDate") String uploadDate);
 
 
-
-
-
-
-
     //TODO XML的时间+post的file_id
     @Update("UPDATE PREPRO_PERSON SET CARD_TYPE_ID =9 \n" +
             "WHERE JMSFZSLH = (\n" +

src/main/java/com/yxproject/start/mapper/TaskListMapper.java

@@ -562,7 +562,7 @@ public interface TaskListMapper {
     /**
      * 任务单查询历史
      *  辅助库 余证
-     * @param process 工序
+     * @param
      * @return
      */
     @Select("select task.task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME," +
@@ -581,7 +581,7 @@ public interface TaskListMapper {
     /**
      * 任务单查询历史
      *  辅助库 余证
-     * @param process 工序
+     * @param
      * @return
      */
     @Select("select task.task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME,task.ISSUED_DATE,task.ISSUED_NAME,\n" +
@@ -894,4 +894,119 @@ public interface TaskListMapper {
      */
     @Select("SELECT * FROM CARD_TYPE_DIC")
     public List<CardTypeDicEntity> selectTypeList();
+
+
+    //创建任务单查询历史总数
+    @Select("SELECT COUNT(*) \n" +
+            "FROM SPECIAL_CARD \n" +
+            "LEFT JOIN TASK ON TASK.TASK_ID=SPECIAL_CARD.TASK_ID \n" +
+            "WHERE TO_CHAR(TASK.SUBMIT_DATE,'yyyy-MM-dd')=#{date}")
+    public String selectCountSubmit(@Param("date") String date);
+
+    @Select("SELECT SUM(GROUP_NO.VALID_COUNT) \n" +
+            "FROM TASK LEFT JOIN GROUP_NO ON TASK.TASK_ID = GROUP_NO.TASK_ID\n" +
+            "WHERE TO_CHAR(TASK.SUBMIT_DATE,'yyyy-MM-dd')=#{date}")
+    public String selectCountSubmit2(@Param("date")String date);
+
+
+    //下发任务单查询历史总数
+    @Select("SELECT COUNT(*) \n" +
+            "FROM SPECIAL_CARD \n" +
+            "LEFT JOIN TASK ON TASK.TASK_ID=SPECIAL_CARD.TASK_ID \n" +
+            "WHERE TO_CHAR(TASK.ISSUED_DATE,'yyyy-MM-dd')=#{date}")
+    public String selectCountIssue(@Param("date") String date);
+
+    @Select("SELECT SUM(GROUP_NO.VALID_COUNT) \n" +
+            "FROM TASK LEFT JOIN GROUP_NO ON TASK.TASK_ID = GROUP_NO.TASK_ID\n" +
+            "WHERE TO_CHAR(TASK.ISSUED_DATE,'yyyy-MM-dd')=#{date}")
+    public String selectCountIssue2(@Param("date")String date);
+
+
+    //打印转出查询历史总数
+    @Select("SELECT COUNT(*) \n" +
+            "FROM SPECIAL_CARD \n" +
+            "LEFT JOIN TASK ON TASK.TASK_ID=SPECIAL_CARD.TASK_ID \n" +
+            "WHERE TO_CHAR(TASK.PRINT_OUT_DATE,'yyyy-MM-dd')=#{date}")
+    public String selectCountPrintOut(@Param("date") String date);
+
+    @Select("SELECT SUM(GROUP_NO.VALID_COUNT) \n" +
+            "FROM TASK LEFT JOIN GROUP_NO ON TASK.TASK_ID = GROUP_NO.TASK_ID\n" +
+            "WHERE TO_CHAR(TASK.PRINT_OUT_DATE,'yyyy-MM-dd')=#{date}")
+    public String selectCountPrintOut2(@Param("date")String date);
+
+
+    //预定位查询历史总数
+    @Select("SELECT COUNT(*) \n" +
+            "FROM SPECIAL_CARD \n" +
+            "LEFT JOIN TASK ON TASK.TASK_ID=SPECIAL_CARD.TASK_ID \n" +
+            "WHERE TO_CHAR(TASK.POSITION_DATE,'yyyy-MM-dd')=#{date}")
+    public String selectCountPosition(@Param("date") String date);
+
+    @Select("SELECT SUM(GROUP_NO.VALID_COUNT) \n" +
+            "FROM TASK LEFT JOIN GROUP_NO ON TASK.TASK_ID = GROUP_NO.TASK_ID\n" +
+            "WHERE TO_CHAR(TASK.POSITION_DATE,'yyyy-MM-dd')=#{date}")
+    public String selectCountPosition2(@Param("date")String date);
+
+
+    //平压查询历史总数
+    @Select("SELECT COUNT(*) \n" +
+            "FROM SPECIAL_CARD \n" +
+            "LEFT JOIN TASK ON TASK.TASK_ID=SPECIAL_CARD.TASK_ID \n" +
+            "WHERE TO_CHAR(TASK.CONCORA_CRUSH_DATE,'yyyy-MM-dd')=#{date}")
+    public String selectCountConcora(@Param("date") String date);
+
+    @Select("SELECT SUM(GROUP_NO.VALID_COUNT) \n" +
+            "FROM TASK LEFT JOIN GROUP_NO ON TASK.TASK_ID = GROUP_NO.TASK_ID\n" +
+            "WHERE TO_CHAR(TASK.CONCORA_CRUSH_DATE,'yyyy-MM-dd')=#{date}")
+    public String selectCountConcora2(@Param("date")String date);
+
+
+
+    //电写查询历史总数
+    @Select("SELECT COUNT(*) \n" +
+            "FROM SPECIAL_CARD \n" +
+            "LEFT JOIN TASK ON TASK.TASK_ID=SPECIAL_CARD.TASK_ID \n" +
+            "WHERE TO_CHAR(TASK.PUNCHING_DATE,'yyyy-MM-dd')=#{date}")
+    public String selectCountPunching(@Param("date") String date);
+
+    @Select("SELECT SUM(GROUP_NO.VALID_COUNT) \n" +
+            "FROM TASK LEFT JOIN GROUP_NO ON TASK.TASK_ID = GROUP_NO.TASK_ID\n" +
+            "WHERE TO_CHAR(TASK.PUNCHING_DATE,'yyyy-MM-dd')=#{date}")
+    public String selectCountPunching2(@Param("date")String date);
+
+
+
+    //分拣查询历史总数
+    @Select("SELECT COUNT(*) \n" +
+            "FROM SPECIAL_CARD \n" +
+            "LEFT JOIN TASK ON TASK.TASK_ID=SPECIAL_CARD.TASK_ID \n" +
+            "WHERE TO_CHAR(TASK.SORTING_DATE,'yyyy-MM-dd')=#{date}")
+    public String selectCountSorting(@Param("date") String date);
+
+    @Select("SELECT SUM(GROUP_NO.VALID_COUNT) \n" +
+            "FROM TASK LEFT JOIN GROUP_NO ON TASK.TASK_ID = GROUP_NO.TASK_ID\n" +
+            "WHERE TO_CHAR(TASK.SORTING_DATE,'yyyy-MM-dd')=#{date}")
+    public String selectCountSorting2(@Param("date")String date);
+
+
+
+    //人工质检查询历史总数
+    @Select("SELECT COUNT(*) \n" +
+            "FROM SPECIAL_CARD \n" +
+            "LEFT JOIN TASK ON TASK.TASK_ID=SPECIAL_CARD.TASK_ID \n" +
+            "WHERE TO_CHAR(TASK.QUALITY_TEST_DATE,'yyyy-MM-dd')=#{date}")
+    public String selectCountQuality(@Param("date") String date);
+
+    @Select("SELECT SUM(GROUP_NO.VALID_COUNT) \n" +
+            "FROM TASK LEFT JOIN GROUP_NO ON TASK.TASK_ID = GROUP_NO.TASK_ID\n" +
+            "WHERE TO_CHAR(TASK.QUALITY_TEST_DATE,'yyyy-MM-dd')=#{date}")
+    public String selectCountQuality2(@Param("date")String date);
+
+
+
+
+
+
+
+
 }

src/main/java/com/yxproject/start/service/TaskListService.java

@@ -6,6 +6,7 @@ import com.yxproject.start.entity.TaskEntity;
 import com.yxproject.start.entity.TaskList.CountCountyEntity;
 import com.yxproject.start.entity.TaskList.CountGajgEntity;
 import com.yxproject.start.entity.TaskList.TaskListEntity;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -55,4 +56,44 @@ public interface TaskListService {
     public boolean saveFastTask(TaskEntity taskEntity);
 
     public List<CardTypeDicEntity> getTypeList();
+
+    public String selectCountSubmit(@Param("date") String date);
+
+    public String selectCountSubmit2(@Param("date")String date);
+
+
+    public String selectCountIssue(@Param("date") String date);
+
+    public String selectCountIssue2(@Param("date")String date);
+
+
+    public String selectCountPrintOut(@Param("date") String date);
+
+    public String selectCountPrintOut2(@Param("date")String date);
+
+
+    public String selectCountPosition(@Param("date") String date);
+
+    public String selectCountPosition2(@Param("date")String date);
+
+
+    public String selectCountConcora(@Param("date") String date);
+
+    public String selectCountConcora2(@Param("date")String date);
+
+
+    public String selectCountPunching(@Param("date") String date);
+
+    public String selectCountPunching2(@Param("date")String date);
+
+
+    public String selectCountSorting(@Param("date") String date);
+
+    public String selectCountSorting2(@Param("date")String date);
+
+
+    public String selectCountQuality(@Param("date") String date);
+
+    public String selectCountQuality2(@Param("date")String date);
+
 }

src/main/java/com/yxproject/start/service/impl/TaskListServiceImpl.java

@@ -598,6 +598,102 @@ public class TaskListServiceImpl implements TaskListService {
         return taskListMapper.selectTypeList();
     }
 
+    @Override
+    public String selectCountSubmit(String date) {
+       String count1= taskListMapper.selectCountSubmit(date);
+        return count1;
+    }
+
+    @Override
+    public String selectCountSubmit2(String date) {
+       String count2= taskListMapper.selectCountSubmit2(date);
+        return count2;
+    }
+
+    @Override
+    public String selectCountIssue(String date) {
+       String count1= taskListMapper.selectCountIssue(date);
+        return count1;
+    }
+
+    @Override
+    public String selectCountIssue2(String date) {
+        String count2=taskListMapper.selectCountIssue2(date);
+        return count2;
+    }
+
+    @Override
+    public String selectCountPrintOut(String date) {
+        String count1=taskListMapper.selectCountPrintOut(date);
+        return count1;
+    }
+
+    @Override
+    public String selectCountPrintOut2(String date) {
+        String count2=taskListMapper.selectCountPrintOut2(date);
+        return count2;
+    }
+
+    @Override
+    public String selectCountPosition(String date) {
+        String count1=taskListMapper.selectCountPosition(date);
+        return count1;
+    }
+
+    @Override
+    public String selectCountPosition2(String date) {
+        String count2 = taskListMapper.selectCountPosition2(date);
+        return count2;
+    }
+
+    @Override
+    public String selectCountConcora(String date) {
+        String count1=taskListMapper.selectCountConcora(date);
+        return count1;
+    }
+
+    @Override
+    public String selectCountConcora2(String date) {
+        String count2=taskListMapper.selectCountConcora2(date);
+        return null;
+    }
+
+    @Override
+    public String selectCountPunching(String date) {
+        String count1 = taskListMapper.selectCountPunching(date);
+        return count1;
+    }
+
+    @Override
+    public String selectCountPunching2(String date) {
+        String count2=taskListMapper.selectCountPunching2(date);
+        return count2;
+    }
+
+    @Override
+    public String selectCountSorting(String date) {
+        String count1=taskListMapper.selectCountSorting(date);
+        return count1;
+    }
+
+    @Override
+    public String selectCountSorting2(String date) {
+        String count2=taskListMapper.selectCountSorting2(date);
+        return count2;
+    }
+
+    @Override
+    public String selectCountQuality(String date) {
+        String count1=taskListMapper.selectCountQuality(date);
+        return count1;
+    }
+
+    @Override
+    public String selectCountQuality2(String date) {
+        String count2= taskListMapper.selectCountQuality2(date);
+        return count2;
+    }
+
 
     private String createGroupNo(List<Integer> c, List<Integer> nsList) {
         try {

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

@@ -17,6 +17,10 @@
             <td ng-if="item.SEX_NO==1">男</td>
             <td ng-if="item.SEX_NO==2">女</td>
             <td ng-if="item.SEX_NO==-1">错误</td>
+            <td ng-if="item.SPECIAL_TYPE==2">快证</td>
+            <td ng-if="item.SPECIAL_TYPE==1">余证</td>
+            <td ng-if="item.SPECIAL_TYPE==0">废证</td>
+            <td ng-if="item.SPECIAL_TYPE==3">退证</td>
         </tr>
         </tbody>
     </table>

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

@@ -8,6 +8,7 @@
         <th>身份证号</th>
         <th>姓名</th>
         <th>性别</th>
+        <th>类型</th>
         </thead>
         <tbody>
         <tr ng-repeat="item in personInfo">
@@ -17,6 +18,10 @@
             <td ng-if="item.SEX_NO==1">男</td>
             <td ng-if="item.SEX_NO==2">女</td>
             <td ng-if="item.SEX_NO==-1">错误</td>
+            <td ng-if="item.SPECIAL_TYPE==2">快证</td>
+            <td ng-if="item.SPECIAL_TYPE==1">余证</td>
+            <td ng-if="item.SPECIAL_TYPE==0">废证</td>
+            <td ng-if="item.SPECIAL_TYPE==3">退证</td>
         </tr>
         </tbody>
     </table>

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

@@ -17,6 +17,10 @@
             <td ng-if="item.SEX_NO==1">男</td>
             <td ng-if="item.SEX_NO==2">女</td>
             <td ng-if="item.SEX_NO==-1">错误</td>
+            <td ng-if="item.SPECIAL_TYPE==2">快证</td>
+            <td ng-if="item.SPECIAL_TYPE==1">余证</td>
+            <td ng-if="item.SPECIAL_TYPE==0">废证</td>
+            <td ng-if="item.SPECIAL_TYPE==3">退证</td>
         </tr>
         </tbody>
     </table>

src/main/resources/static/js/app.js

@@ -32,7 +32,7 @@ angular.module('AvatarCheck', [
     $qProvider.errorOnUnhandledRejections(false)
 }])
 
-    .controller('appCtrl', function ($scope, $location, $rootScope, HttpService, localStorageService, DebugService) {
+    .controller('appCtrl', function ($scope, $location, $rootScope, HttpService, localStorageService, DebugService,MessageService) {
 
         DebugService.debug("appCtrl:" + "AvatarCheck initial.")
 
@@ -172,6 +172,7 @@ angular.module('AvatarCheck', [
             }else{
                 HttpService.searchCards(searchInput, function (data) {
                     if(data==''){
+                        $scope.msg="";
                         $scope.alertMsg = "暂无数据";
                     }else{
                         $scope.searchResult = data;
@@ -203,6 +204,7 @@ angular.module('AvatarCheck', [
         }
 
         $scope.addQuickCardAccu = function(){
+            if($(".accu:checked").length>0){
                 var idx = $(".accu:checked").val();
                 var check = idx.split("+");
                 var json={};
@@ -212,11 +214,16 @@ angular.module('AvatarCheck', [
                 json.name=$rootScope.loginData.name;
                 console.log(json)
                 HttpService.addSpecialCard(json,function (data) {
-                console.log($scope.searchInput)
+                    MessageService.showAlert(data.msg)
                     $scope.doSearch($scope.searchInput)
                 })
+            }else{
+                MessageService.showAlert("请选择要添加的信息")
+            }
+
         }
         $scope.addQuickCardProd = function(){
+            if($(".prod:checked").length>0){
                 var idx = $(".prod:checked").val();
                 var check = idx.split("+");
                 console.log(idx,check)
@@ -227,9 +234,49 @@ angular.module('AvatarCheck', [
                 json.name=$rootScope.loginData.name;
                 console.log(json)
                 HttpService.addSpecialCard(json,function (data) {
-                console.log($scope.searchInput)
+                    MessageService.showAlert(data.msg)
                     $scope.doSearch($scope.searchInput)
                 })
+            }else{
+                MessageService.showAlert("请选择要添加快证的信息")
+            }
+
+        }
+        $scope.giveBackCardAccu = function () {
+            if($(".accu:checked").length>0){
+                var idx = $(".accu:checked").val();
+                var check = idx.split("+");
+                var json={};
+                json.acceptNo=check[0];
+                json.taskId=$scope.searchResult.workOrderDate[0].TASK_ID;
+                json.name=$rootScope.loginData.name;
+                console.log(json)
+                HttpService.giveBackCard(json,function (data) {
+                    console.log(data)
+                    MessageService.showAlert(data.msg)
+                    $scope.doSearch($scope.searchInput)
+                })
+            }else{
+                MessageService.showAlert("请选择要退证的信息")
+            }
+        }
+        $scope.giveBackCardProd = function () {
+            if($(".prod:checked").length>0){
+                var idx = $(".prod:checked").val();
+                var check = idx.split("+");
+                var json={};
+                json.acceptNo=check[0];
+                json.taskId=$scope.searchResult.workOrderDate[0].TASK_ID;
+                json.name=$rootScope.loginData.name;
+                console.log(json)
+                HttpService.giveBackCard(json,function (data) {
+                    console.log(data)
+                    MessageService.showAlert(data.msg)
+                    $scope.doSearch($scope.searchInput)
+                })
+            }else{
+                MessageService.showAlert("请选择要退证的信息")
+            }
         }
 
 

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

@@ -827,6 +827,17 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
                 }).then(function successCallback(response) {
                     success(response.data)
                 })
+            },
+            giveBackCard:function(data,success) {
+                var body = JSON.stringify(data);
+                $http({
+                    method: 'POST',
+                    url: "../TaskList/addBackCard",
+                    data: body,
+                    headers: {'Content-Type': 'application/json'}
+                }).then(function successCallback(response) {
+                    success(response.data)
+                })
             }
         }
     });
\ No newline at end of file

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

@@ -82,7 +82,7 @@ angular.module('AvatarCheck.addFailed', ['ngRoute', 'AvatarCheck.http'])
                             $scope.personInfo = data;
                             $scope.can = false;
                             for(var i=0;i<$scope.personInfo.length;i++){
-                                if($scope.personInfo[i].SEX_NO==-1){
+                                if($scope.personInfo[i].SEX_NO==-1||$scope.personInfo[i].SPECIAL_TYPE==0||$scope.personInfo[i].SPECIAL_TYPE==1||$scope.personInfo[i].SPECIAL_TYPE==2||$scope.personInfo[i].SPECIAL_TYPE==3){
                                     $scope.can = true;
                                 }
                             }

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

@@ -58,7 +58,7 @@ angular.module('AvatarCheck.addRest', ['ngRoute', 'AvatarCheck.http'])
                             $scope.personInfo = data;
                             $scope.can = false;
                             for(var i=0;i<$scope.personInfo.length;i++){
-                                if($scope.personInfo[i].SEX_NO==-1){
+                                if($scope.personInfo[i].SEX_NO==-1||$scope.personInfo[i].SPECIAL_TYPE==0||$scope.personInfo[i].SPECIAL_TYPE==1||$scope.personInfo[i].SPECIAL_TYPE==2||$scope.personInfo[i].SPECIAL_TYPE==3){
                                     $scope.can = true;
                                 }
                             }

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

@@ -75,7 +75,7 @@ angular.module('AvatarCheck.addTag', ['ngRoute', 'AvatarCheck.http'])
                             $scope.personInfo = data;
                             $scope.can = false;
                             for(var i=0;i<$scope.personInfo.length;i++){
-                                if($scope.personInfo[i].SEX_NO==-1){
+                                if($scope.personInfo[i].SEX_NO==-1||$scope.personInfo[i].SPECIAL_TYPE==0||$scope.personInfo[i].SPECIAL_TYPE==1||$scope.personInfo[i].SPECIAL_TYPE==2||$scope.personInfo[i].SPECIAL_TYPE==3){
                                     $scope.can = true;
                                 }
                             }

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

@@ -76,7 +76,7 @@
                         </thead>
                         <tbody>
                         <tr ng-repeat="item in searchResult.ACCdata">
-                            <td><input type="checkbox" value="{{item.ACCEPT_NO}}+{{item.COUNTY_CODE}}+{{item.CARD_TYPE_ID}}" class="accu"></td>
+                            <td><input ng-checked="searchResult.ACCdata.length==1" type="checkbox" value="{{item.ACCEPT_NO}}+{{item.COUNTY_CODE}}+{{item.CARD_TYPE_ID}}" class="accu"></td>
                             <td>{{item.ACCEPT_NO}}</td>
                             <td>{{item.COUNTYNAME}}</td>
                             <td>{{item.NAME}}</td>
@@ -96,7 +96,7 @@
                 </div>
                 <div style="text-align:right;padding: 10px;padding-top: 0;">
                     <button class="btn btn-info" ng-click="addQuickCardAccu()">添加快证</button>
-                    <button class="btn btn-danger">退证</button>
+                    <button class="btn btn-danger" ng-click="giveBackCardAccu()">退证</button>
                 </div>
             </div>
             <!--制证库-->
@@ -127,7 +127,7 @@
                         </thead>
                         <tbody>
                         <tr ng-repeat="item in searchResult.PRODData">
-                            <td><input type="checkbox" value="{{item.ACCEPT_NO}}+{{item.COUNTY_CODE}}+{{item.CARD_TYPE_ID}}" class="prod"></td>
+                            <td><input ng-checked="searchResult.PRODData.length==1" type="checkbox" value="{{item.ACCEPT_NO}}+{{item.COUNTY_CODE}}+{{item.CARD_TYPE_ID}}" class="prod"></td>
                             <td>{{item.ACCEPT_NO}}</td>
                             <td>{{item.COUNTYNAME}}</td>
                             <td>{{item.NAME}}</td>
@@ -147,14 +147,9 @@
                 </div>
                 <div style="text-align:right;padding: 10px;padding-top: 0;">
                     <button class="btn btn-info" ng-click="addQuickCardProd()">添加快证</button>
-                    <button class="btn btn-danger">退证</button>
+                    <button class="btn btn-danger" ng-click="giveBackCardAccu()">退证</button>
                 </div>
             </div>
-
-            <h4>{{searchResult.workOrderDate}}</h4>
-            <h4>{{searchResult.workOrderDate.length}}</h4>
-            <h4>{{searchResult.ACCdata.length}}</h4>
-            <h4>{{searchResult.PRODData.length}}</h4>
             <div ng-if="searchResult.workOrderDate.length==0&&searchResult.ACCdata.length==0&&searchResult.PRODData.length==0">
                 <h4>没有查询到相关信息</h4>
             </div>