新增分拣电质检数量和转出禁用按钮

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

@@ -435,7 +435,8 @@ public interface TaskListMapper {
      * @return
      */
     @Select("select DISTINCT nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0) finish_COUNT,count(*) police_Count,'000000000' police_code ,'000000000' GAJG_MC,\n" +
-            "sum(decode(prod_trace_t.ELECTRIC_WRITER_NO,null,0,1)) e_writer_count,\n" +
+            "sum(decode(prod_trace_t.ELECTRIC_WRITER_NO,null,0,1)) e_writer_count," +
+            "sum(decode(prod_trace_t.CHECK_DATE,null,0,1)) CHECK_count,\n" +
             "task.submit_date, task.task_id,CARD_TYPE_DIC.CARD_TYPE,\n" +
             "CARD_TYPE_DIC.CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" +
             "COUNTY_DIC.COUNTYNAME, group_no.VALID_COUNT,group_no.INVALID_COUNT,\n" +
@@ -463,7 +464,8 @@ public interface TaskListMapper {
      * @return
      */
     @Select("select DISTINCT nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0) finish_COUNT,count(*) police_Count,'000000000' police_code ,'000000000' GAJG_MC,\n" +
-            "sum(decode(prod_trace_t.ELECTRIC_WRITER_NO,null,0,1)) e_writer_count,\n" +
+            "sum(decode(prod_trace_t.ELECTRIC_WRITER_NO,null,0,1)) e_writer_count," +
+            "sum(decode(prod_trace_t.CHECK_DATE,null,0,1)) CHECK_count,\n" +
             "task.submit_date, task.task_id,CARD_TYPE_DIC.CARD_TYPE,\n" +
             "CARD_TYPE_DIC.CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" +
             "COUNTY_DIC.COUNTYNAME, group_no.VALID_COUNT,group_no.INVALID_COUNT,\n" +
@@ -700,7 +702,7 @@ public interface TaskListMapper {
      * @param process 工序
      * @return
      */
-    @Select("select DISTINCT nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0) finish_COUNT,count(substr(prod_card_t.upload_no,0,9)) police_Count,substr(prod_card_t.upload_no,0,9) police_code ,GAJG_DM.GAJG_MC,sum(decode(prod_trace_t.ELECTRIC_WRITER_NO,null,0,1)) e_writer_count,task.submit_date, SPECIAL_CARD.task_id,'快证' CARD_TYPE,'1' CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" +
+    @Select("select DISTINCT nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0) finish_COUNT,count(substr(prod_card_t.upload_no,0,9)) police_Count,substr(prod_card_t.upload_no,0,9) police_code ,GAJG_DM.GAJG_MC,sum(decode(prod_trace_t.ELECTRIC_WRITER_NO,null,0,1)) e_writer_count,sum(decode(prod_trace_t.CHECK_DATE,null,0,1)) CHECK_count,task.submit_date, SPECIAL_CARD.task_id,'快证' CARD_TYPE,'1' CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" +
             "COUNTY_DIC.COUNTYNAME, 1 VALID_COUNT, 0 INVALID_COUNT,0 SPECIAL_CARD_COUNT,\n" +
             "SPECIAL_CARD.ACCEPT_NO group_No, nvl(fc.faileCount,0) faileCount\n" +
             "from SPECIAL_CARD left join task on SPECIAL_CARD.task_id= task.TASK_ID\n" +
@@ -724,7 +726,7 @@ public interface TaskListMapper {
      * @param process 工序
      * @return
      */
-    @Select("select DISTINCT nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0) finish_COUNT,count(substr(prod_card_t.upload_no,0,9)) police_Count,substr(prod_card_t.upload_no,0,9) police_code ,GAJG_DM.GAJG_MC,sum(decode(prod_trace_t.ELECTRIC_WRITER_NO,null,0,1)) e_writer_count,task.submit_date, SPECIAL_CARD.task_id,'快证' CARD_TYPE,'1' CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" +
+    @Select("select DISTINCT nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0) finish_COUNT,count(substr(prod_card_t.upload_no,0,9)) police_Count,substr(prod_card_t.upload_no,0,9) police_code ,GAJG_DM.GAJG_MC,sum(decode(prod_trace_t.ELECTRIC_WRITER_NO,null,0,1)) e_writer_count,sum(decode(prod_trace_t.CHECK_DATE,null,0,1)) CHECK_count,task.submit_date, SPECIAL_CARD.task_id,'快证' CARD_TYPE,'1' CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" +
             "COUNTY_DIC.COUNTYNAME, 1 VALID_COUNT, 0 INVALID_COUNT,0 SPECIAL_CARD_COUNT,\n" +
             "SPECIAL_CARD.ACCEPT_NO group_No, nvl(fc.faileCount,0) faileCount\n" +
             "from SPECIAL_CARD left join task on SPECIAL_CARD.task_id= task.TASK_ID\n" +
@@ -1055,7 +1057,7 @@ public interface TaskListMapper {
      * @param process 工序
      * @return
      */
-    @Select("select DISTINCT nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0) finish_COUNT, count(substr(prod_card_t.upload_no,0,9)) police_Count,substr(prod_card_t.upload_no,0,9) police_code ,GAJG_DM.GAJG_MC,sum(decode(prod_trace_t.ELECTRIC_WRITER_NO,null,0,1)) e_writer_count,task.submit_date, SPECIAL_CARD.task_id,'余证' CARD_TYPE,'99' CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" +
+    @Select("select DISTINCT nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0) finish_COUNT, count(substr(prod_card_t.upload_no,0,9)) police_Count,substr(prod_card_t.upload_no,0,9) police_code ,GAJG_DM.GAJG_MC,sum(decode(prod_trace_t.ELECTRIC_WRITER_NO,null,0,1)) e_writer_count,sum(decode(prod_trace_t.CHECK_DATE,null,0,1)) CHECK_count,task.submit_date, SPECIAL_CARD.task_id,'余证' CARD_TYPE,'99' CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" +
             "COUNTY_DIC.COUNTYNAME, 1 VALID_COUNT, 0 INVALID_COUNT,0 SPECIAL_CARD_COUNT,\n" +
             "SPECIAL_CARD.ACCEPT_NO group_No, nvl(fc.faileCount,0) faileCount\n" +
             "from SPECIAL_CARD left join task on SPECIAL_CARD.task_id= task.TASK_ID\n" +
@@ -1080,7 +1082,7 @@ public interface TaskListMapper {
      * @param process 工序
      * @return
      */
-    @Select("select DISTINCT nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0) finish_COUNT, count(substr(prod_card_t.upload_no,0,9)) police_Count,substr(prod_card_t.upload_no,0,9) police_code ,GAJG_DM.GAJG_MC,sum(decode(prod_trace_t.ELECTRIC_WRITER_NO,null,0,1)) e_writer_count,task.submit_date, SPECIAL_CARD.task_id,'余证' CARD_TYPE,'99' CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" +
+    @Select("select DISTINCT nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0) finish_COUNT, count(substr(prod_card_t.upload_no,0,9)) police_Count,substr(prod_card_t.upload_no,0,9) police_code ,GAJG_DM.GAJG_MC,sum(decode(prod_trace_t.ELECTRIC_WRITER_NO,null,0,1)) e_writer_count,sum(decode(prod_trace_t.CHECK_DATE,null,0,1)) CHECK_count,task.submit_date, SPECIAL_CARD.task_id,'余证' CARD_TYPE,'99' CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" +
             "COUNTY_DIC.COUNTYNAME, 1 VALID_COUNT, 0 INVALID_COUNT,0 SPECIAL_CARD_COUNT,\n" +
             "SPECIAL_CARD.ACCEPT_NO group_No, nvl(fc.faileCount,0) faileCount\n" +
             "from SPECIAL_CARD left join task on SPECIAL_CARD.task_id= task.TASK_ID\n" +
@@ -1162,7 +1164,8 @@ public interface TaskListMapper {
      * @return
      */
     @Select("select DISTINCT 0 finish_COUNT, count(substr(prod_card_t.upload_no,0,9)) police_Count,\n" +
-            "substr(prod_card_t.upload_no,0,9) police_code ,GAJG_DM.GAJG_MC,sum(decode(prod_trace_t.ELECTRIC_WRITER_NO,null,0,1)) e_writer_count,\n" +
+            "substr(prod_card_t.upload_no,0,9) police_code ,GAJG_DM.GAJG_MC,sum(decode(prod_trace_t.ELECTRIC_WRITER_NO,null,0,1)) e_writer_count," +
+            "sum(decode(prod_trace_t.CHECK_DATE,null,0,1)) CHECK_count,\n" +
             "task.submit_date,FAILED_CARD.failed_card_id task_id,'废证' CARD_TYPE,'100' CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" +
             "COUNTY_DIC.COUNTYNAME, 1 VALID_COUNT, 0 INVALID_COUNT,0 SPECIAL_CARD_COUNT,\n" +
             "FAILED_CARD.ACCEPT_NO group_No, 0 faileCount\n" +
@@ -1185,7 +1188,8 @@ public interface TaskListMapper {
      * @return
      */
     @Select("select DISTINCT 0 finish_COUNT, count(substr(prod_card_t.upload_no,0,9)) police_Count,\n" +
-            "substr(prod_card_t.upload_no,0,9) police_code ,GAJG_DM.GAJG_MC,sum(decode(prod_trace_t.ELECTRIC_WRITER_NO,null,0,1)) e_writer_count,\n" +
+            "substr(prod_card_t.upload_no,0,9) police_code ,GAJG_DM.GAJG_MC,sum(decode(prod_trace_t.ELECTRIC_WRITER_NO,null,0,1)) e_writer_count," +
+            "sum(decode(prod_trace_t.CHECK_DATE,null,0,1)) CHECK_count,\n" +
             "task.submit_date,FAILED_CARD.failed_card_id task_id,'废证' CARD_TYPE,'100' CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" +
             "COUNTY_DIC.COUNTYNAME, 1 VALID_COUNT, 0 INVALID_COUNT,0 SPECIAL_CARD_COUNT,\n" +
             "FAILED_CARD.ACCEPT_NO group_No, 0 faileCount\n" +

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

@@ -367,7 +367,7 @@ public class TaskListServiceImpl implements TaskListService {
     /**
      * 查询任务单详情
      * 辅助库、制证库
-     * (电写入 分拣)
+     * (电写入 )
      *
      * @param process 查询工序
      * @return
@@ -378,19 +378,19 @@ public class TaskListServiceImpl implements TaskListService {
         List<Map<String, Object>> list = new ArrayList<>();
         //电写入
 //        if (process==4){
-////            //查询普通组号列表 在辅助库、制证库中
-////            List<Map<String, Object>> mapList_common = taskListMapper.selectByCountyAtAuxiliary_common2(process,process-1);
-////            //查询快证组号列表 在辅助库、制证库中
-////            List<Map<String, Object>> mapList_fast = taskListMapper.selectByCountyAtAuxiliary_fast3(process,process-1);
-////            //查询余证组号列表 在辅助库、制证库中
-////            List<Map<String, Object>> mapList_remaind = taskListMapper.selectByCountyAtAuxiliary_remaind3(process,process-1);
-////            //查询余证组号列表 在辅助库、制证库中
-////            List<Map<String, Object>> mapList_failed = taskListMapper.selectByCountyAtAuxiliary_failed2(process-1);
-////
-////            list = formateMap2(mapList_common);
-////            list.addAll(formateMap2(mapList_fast));
-////            list.addAll(formateMap2(mapList_remaind));
-////            list.addAll(formateMap2(mapList_failed));
+//            //查询普通组号列表 在辅助库、制证库中
+//            List<Map<String, Object>> mapList_common = taskListMapper.selectByCountyAtAuxiliary_common2(process,process-1);
+//            //查询快证组号列表 在辅助库、制证库中
+//            List<Map<String, Object>> mapList_fast = taskListMapper.selectByCountyAtAuxiliary_fast3(process,process-1);
+//            //查询余证组号列表 在辅助库、制证库中
+//            List<Map<String, Object>> mapList_remaind = taskListMapper.selectByCountyAtAuxiliary_remaind3(process,process-1);
+//            //查询余证组号列表 在辅助库、制证库中
+//            List<Map<String, Object>> mapList_failed = taskListMapper.selectByCountyAtAuxiliary_failed2(process-1);
+//
+//            list = formateMap2(mapList_common);
+//            list.addAll(formateMap2(mapList_fast));
+//            list.addAll(formateMap2(mapList_remaind));
+//            list.addAll(formateMap2(mapList_failed));
 //
 //        }else {
             //分拣任务单
@@ -417,7 +417,7 @@ public class TaskListServiceImpl implements TaskListService {
     /**
      * 查询任务单详情
      * 辅助库、制证库
-     * (电写入 分拣)
+     * (分拣)
      *
      * @param process 查询工序
      * @return
@@ -428,19 +428,19 @@ public class TaskListServiceImpl implements TaskListService {
         List<Map<String, Object>> list = new ArrayList<>();
         //电写入
 //        if (process==4){
-////            //查询普通组号列表 在辅助库、制证库中
-////            List<Map<String, Object>> mapList_common = taskListMapper.selectByCountyAtAuxiliary_common2(process,process-1);
-////            //查询快证组号列表 在辅助库、制证库中
-////            List<Map<String, Object>> mapList_fast = taskListMapper.selectByCountyAtAuxiliary_fast3(process,process-1);
-////            //查询余证组号列表 在辅助库、制证库中
-////            List<Map<String, Object>> mapList_remaind = taskListMapper.selectByCountyAtAuxiliary_remaind3(process,process-1);
-////            //查询余证组号列表 在辅助库、制证库中
-////            List<Map<String, Object>> mapList_failed = taskListMapper.selectByCountyAtAuxiliary_failed2(process-1);
-////
-////            list = formateMap2(mapList_common);
-////            list.addAll(formateMap2(mapList_fast));
-////            list.addAll(formateMap2(mapList_remaind));
-////            list.addAll(formateMap2(mapList_failed));
+//            //查询普通组号列表 在辅助库、制证库中
+//            List<Map<String, Object>> mapList_common = taskListMapper.selectByCountyAtAuxiliary_common2(process,process-1);
+//            //查询快证组号列表 在辅助库、制证库中
+//            List<Map<String, Object>> mapList_fast = taskListMapper.selectByCountyAtAuxiliary_fast3(process,process-1);
+//            //查询余证组号列表 在辅助库、制证库中
+//            List<Map<String, Object>> mapList_remaind = taskListMapper.selectByCountyAtAuxiliary_remaind3(process,process-1);
+//            //查询余证组号列表 在辅助库、制证库中
+//            List<Map<String, Object>> mapList_failed = taskListMapper.selectByCountyAtAuxiliary_failed2(process-1);
+//
+//            list = formateMap2(mapList_common);
+//            list.addAll(formateMap2(mapList_fast));
+//            list.addAll(formateMap2(mapList_remaind));
+//            list.addAll(formateMap2(mapList_failed));
 //
 //        }else {
         //分拣任务单
@@ -512,7 +512,8 @@ public class TaskListServiceImpl implements TaskListService {
                 //查询历史任务单 余证
                 mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_remaind3(date));
                 //查询历史任务单 废证
-                mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_failed3(date));
+//                mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_failed3(date));
+                mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_failed5(date,workGroup));
                 break;
             case 4:
                 //查询历史任务单 大批证
@@ -856,7 +857,7 @@ public class TaskListServiceImpl implements TaskListService {
         for (Map o : maplist) {
             // 组合JSON
             if (typeMap != null & typeMap.containsKey(o.get("CARD_TYPE") + "")) {
-                List<Map<String, Object>> mapList = (List<Map<String, Object>>) typeMap.get(o.get("CARD_TYPE"));
+                List<Map<String, Object>> mapList = (List<Map<String, Object>>) typeMap.get(o.get("CARD_TYPE")+"");
                 mapList.add(o);
                 typeMap.put(o.get("CARD_TYPE") + "", mapList);
             } else {
@@ -998,6 +999,7 @@ public class TaskListServiceImpl implements TaskListService {
                 int eWriteCount = 0;
                 int faileCount = 0;
                 int recheckCount = 0;
+                int checkCount = 0;
                 String countyName = null;
                 String countyCode = null;
                 Object submitDate = null;
@@ -1015,6 +1017,7 @@ public class TaskListServiceImpl implements TaskListService {
                     faileCount += Integer.valueOf(countyMap.get("FAILECOUNT") + "");
                     eWriteCount += Integer.valueOf(countyMap.get("E_WRITER_COUNT") + "");
                     recheckCount += Integer.valueOf(countyMap.get("FINISH_COUNT") + "");
+                    checkCount += Integer.valueOf(countyMap.get("CHECK_COUNT") + "");
                 }
                 if (countyMapList.size() == 1) {
                     countyMapGroup.put("groupNum", countyMapList.get(0).get("GROUP_NO"));
@@ -1048,6 +1051,7 @@ public class TaskListServiceImpl implements TaskListService {
                 countyMapGroup.put("countyValidCount", validCount);
                 countyMapGroup.put("countyInvalidCount", invalidCount);
                 countyMapGroup.put("recheckCount", recheckCount);
+                countyMapGroup.put("checkCount", checkCount);
                 countyList.add(countyMapGroup);
             }
             mapType.put("typeCode", typeName);

src/main/resources/application.yml

@@ -4,7 +4,7 @@ server:
 spring:
   datasource:
     driver-class-name: oracle.jdbc.driver.OracleDriver
-    url: jdbc:oracle:thin:@192.168.1.102:1521:yingxin
+    url: jdbc:oracle:thin:@192.168.1.16:1521:yingxin
     username: yingxin
     password: yingxin
   servlet:

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

@@ -5,7 +5,7 @@
     <div>本次转出总数：{{selectCount}}</div>
 </div>
 <div class="ui-dialog-confirm">
-    <button type="submit" class="btn btn-info" ng-click="confirmGoTo()">确认</button>
+    <button type="submit" class="btn btn-info create" ng-click="confirmGoTo()">确认</button>
     <button type="submit" class="btn btn-danger" ng-click="closeThisDialog()">取消</button>
 </div>
 

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

@@ -200,6 +200,7 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm
             }
             console.log("for",$rootScope.selectCount)
             var go = function () {
+                $rootScope.closeBtn();
                 if($scope.selected.length>0||$rootScope.selectedGroup.length>0){
                     var groupList = [];
                     for (var i=0;i<$scope.selected.length;i++){
@@ -226,6 +227,7 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm
                         $scope.searchCurrent();
                         $scope.selected=[];
                         $rootScope.selectCount=[];
+                        $rootScope.ableBtn();
                         $rootScope.closeThis();
                     })
                 }else{
@@ -239,6 +241,12 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm
                 closeByDocument:false,
                 controller: ['$scope', 'HttpService',function ($scope) {
                     $rootScope.closeThis=$scope.closeThisDialog;
+                    $rootScope.ableBtn = function(){
+                        $(".create").prop("disabled","false");
+                    }
+                    $rootScope.closeBtn = function(){
+                        $(".create").prop("disabled","true");
+                    }
                     $scope.confirmGoTo = go;
                 }]
             })

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

@@ -143,6 +143,7 @@ angular.module('AvatarCheck.dispatchTask', ['ngRoute', 'AvatarCheck.http', 'tm.p
             }
             console.log("for",$rootScope.selectCount)
             var go = function () {
+                $rootScope.closeBtn();
                 var checks = $(".checkOneBox:checked");
                 if(checks.length>0){
                     var arr = [];
@@ -165,6 +166,7 @@ angular.module('AvatarCheck.dispatchTask', ['ngRoute', 'AvatarCheck.http', 'tm.p
                     HttpService.updateTaskListProcess(json,function(data){
                         $scope.searchTaskList();
                         $scope.selected=[];
+                        $rootScope.ableBtn();
                         $rootScope.closeThis();
                     })
                 }else{
@@ -178,6 +180,12 @@ angular.module('AvatarCheck.dispatchTask', ['ngRoute', 'AvatarCheck.http', 'tm.p
                 closeByDocument:false,
                 controller: ['$scope', 'HttpService',function ($scope) {
                     $rootScope.closeThis=$scope.closeThisDialog;
+                    $rootScope.ableBtn = function(){
+                        $(".create").prop("disabled","false");
+                    }
+                    $rootScope.closeBtn = function(){
+                        $(".create").prop("disabled","true");
+                    }
                     $scope.confirmGoTo = go;
                 }]
             })

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

@@ -525,6 +525,7 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
             }
             console.log("for",$rootScope.selectCount)
             var go = function () {
+                $rootScope.closeBtn();
                 var checks = $(".checkOneBox:checked");
                 if(checks.length>0){
                     var arr = [];
@@ -546,6 +547,7 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
                     HttpService.updateTaskListProcess(json,function(data){
                         $scope.searchTaskList();
                         $scope.selected=[];
+                        $rootScope.ableBtn();
                         $rootScope.closeThis();
                     })
                 }else{
@@ -558,6 +560,12 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
                 cache: false,
                 closeByDocument:false,
                 controller: ['$scope', 'HttpService',function ($scope) {
+                    $rootScope.ableBtn = function(){
+                        $(".create").prop("disabled","false");
+                    }
+                    $rootScope.closeBtn = function(){
+                        $(".create").prop("disabled","true");
+                    }
                     $scope.confirmGoTo = go;
                     $rootScope.closeThis = $scope.closeThisDialog;
                 }]
@@ -691,6 +699,7 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
             }
             console.log("for",$rootScope.selectCount)
             var go = function () {
+                $rootScope.closeBtn();
                 var checks = $(".checkOneBox:checked");
                 if(checks.length>0){
                     var arr = [];
@@ -712,6 +721,7 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
                     HttpService.updateTaskListProcess(json,function(data){
                         $scope.searchTaskList();
                         $scope.selected=[];
+                        $rootScope.ableBtn();
                         $rootScope.closeThis();
                     })
                 }else{
@@ -725,6 +735,12 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
                 closeByDocument:false,
                 controller: ['$scope', 'HttpService',function ($scope) {
                     $rootScope.closeThis=$scope.closeThisDialog;
+                    $rootScope.ableBtn = function(){
+                        $(".create").prop("disabled","false");
+                    }
+                    $rootScope.closeBtn = function(){
+                        $(".create").prop("disabled","true");
+                    }
                     $scope.confirmGoTo = go;
                 }]
             })

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

@@ -36,11 +36,11 @@
                      <th><input type="checkbox" ng-click="selectAll(type.countyList,$event)" ng-checked="isSelectedAll($index)"></th>
                      <th><a ng-click="countyCode='taskId';desc=!desc">任务单编号</a></th>
                      <th>核验日期</th>
-                     <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>
@@ -56,6 +56,7 @@
                        <td class="mailbox-subject">{{task.groupNum}}</td>
                        <td class="mailbox-subject">{{task.countyValidCount-task.specialCount}}</td>
                        <td class="mailbox-subject">{{task.eWriteCount}}</td>
+                         <td class="mailbox-subject">{{task.checkCount}}</td>
                        <td class="mailbox-subject">{{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>
@@ -70,6 +71,7 @@
                                       <th>派出所名称</th>
                                       <th>证件数量</th>
                                       <th>电写入数量</th>
+                                      <th>电质检数量</th>
                                       <th>特殊证件数量</th>
                                       <th>废证数量</th>
                                       <th></th>
@@ -80,6 +82,7 @@
                                              <td>{{item.GAJG_MC}}</td>
                                              <td>{{item.VALID_COUNT-item.SPECIAL_CARD_COUNT}}</td>
                                              <td>{{item.E_WRITER_COUNT}}</td>
+                                             <td>{{item.CHECK_COUNT}}</td>
                                              <td>{{item.SPECIAL_CARD_COUNT}}</td>
                                              <td>{{item.FAILECOUNT}}</td>
                                              <td><a ng-click="getSpecialCardsInfo(item.GROUP_NO,item.SPECIAL_CARD_COUNT)">特殊证件详情</a></td>