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

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

@@ -300,7 +300,7 @@ angular.module('AvatarCheck', [
 
         $scope.addQuickCardAccu = function(){
             if($(".accu:checked").length>0){
-                if(angular.isUndefined($scope.searchResult.workOrderData[0].CARD_TYPE_ID)){
+                if(angular.isUndefined($scope.searchResult.workOrderData[0])){
                     MessageService.showAlert("无制证类型记录，请创建任务单后再添加快证")
                 }else{
                     var idx = $(".accu:checked").val();
@@ -351,8 +351,8 @@ angular.module('AvatarCheck', [
         }
         $scope.giveBackCardAccu = function () {
             if($(".accu:checked").length>0){
-                if(angular.isUndefined($scope.searchResult.workOrderData[0].TASK_ID)) {
-                    MessageService.showAlert("无任务单记录，请创建任务单后再添加快证")
+                if(angular.isUndefined($scope.searchResult.workOrderData[0])) {
+                    MessageService.showAlert("无任务单记录，请创建任务单后再添加退证")
                 }else{
                     var idx = $(".accu:checked").val();
                     var check = idx.split("+");