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

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

@@ -281,8 +281,8 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
                     LODOP.SET_PRINT_STYLEA(0, "Alignment", 2);
                     LODOP.SET_PRINT_STYLEA(0, "FontSize", 15);
 
-                    LODOP.PREVIEW();
-                    // LODOP.PRINT();
+                    // LODOP.PREVIEW();
+                    LODOP.PRINT();
                 })
             })
         };

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

@@ -194,14 +194,19 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
             for (var i=0;i<checks.length;i++){
                 arr.push(checks[i].value)
             }
-            var json = {
-                workGroup:groupSelected,
-                taskIdList:arr
+            if(arr.length>0){
+                var json = {
+                    workGroup:groupSelected,
+                    taskIdList:arr
+                }
+                HttpService.updateWorkGroup(json,function(data) {
+                    console.log(data)
+                    $scope.searchTaskList();
+                })
+            }else{
+                MessageService.showAlert("请选择要更新的任务单")
             }
-            HttpService.updateWorkGroup(json,function(data) {
-                console.log(data)
-                $scope.searchTaskList();
-            })
+
         }
 
         $scope.goes = function(){

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

@@ -112,8 +112,6 @@
                         <button class="btn btn-primary" ng-click="goes()">转出任务单</button>
                     </div>
                 </div>
-              </div>
-             </div>
               <!-- /.mail-box-messages -->
              <div ng-if="cycleSheetData.length==0">
                   <h4>暂无数据</h4>