Merge branch 'dev' of…

Merge branch 'dev' of http://121.22.111.250:8000/YX_IDENT_auxiliary/YX_IDENT_beijing_auxiliary 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

@@ -186,22 +186,25 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
                 name:'B组'
             }
         ]
-        $scope.updateGroup = function() {
-            var groupSelected = $("#groupSelected").val();
-            console.log(groupSelected)
-            var checks = $("#checkOneBox:checked");
-            var arr = [];
-            for (var i=0;i<checks.length;i++){
-                arr.push(checks[i].value)
-            }
-            var json = {
-                workGroup:groupSelected,
-                taskIdList:arr
+        $scope.updateGroup = function(group) {
+
+            if (group>0){
+                var checks = $("#checkOneBox:checked");
+                var arr = [];
+                for (var i=0;i<checks.length;i++){
+                    arr.push(checks[i].value)
+                }
+                var json = {
+                    workGroup:group,
+                    taskIdList:arr
+                }
+                console.log(group,"===",json," 更新工作组")
+                HttpService.updateWorkGroup(json,function(data) {
+                    console.log(data)
+                    $scope.searchTaskList();
+                })
             }
-            HttpService.updateWorkGroup(json,function(data) {
-                console.log(data)
-                $scope.searchTaskList();
-            })
+
         }
 
         $scope.goes = function(){

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

@@ -101,12 +101,15 @@
                 <!-- /.table -->
                 <div class="box-footer">
                     <div class="pull-left">
-                        <select class="form-control select2" id="groupSelected" style="border-radius:5px">
-                            <option value="{{group.id}}" ng-repeat="group in groupList">{{group.name}}</option>
+                        <select class="form-control select2" style="border-radius:5px"
+                                ng-model="workGroup">
+                            <option value="">请选择工作组</option>
+                            <option value="1">A组</option>
+                            <option value="2">B组</option>
                         </select>
                     </div>
                     <div class="pull-left" style="margin-left: 10px;">
-                        <button class="btn btn-info" ng-click="updateGroup()">更新工作组</button>
+                        <button class="btn btn-info" ng-click="updateGroup(workGroup)">更新工作组</button>
                     </div>
                     <div class="pull-right" style="margin-left: 10px;">
                         <button class="btn btn-primary" ng-click="goes()">转出任务单</button>