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/receitp/receitp.html

@@ -119,7 +119,6 @@
                                       <td></td>
                                   </tr>
                                   <tr ng-repeat="police in item.policeList">
-                                      <td></td>
                                       <td>{{police.ID}}</td>
                                       <td>{{police.GAJG_DM}}</td>
                                       <td>{{police.GAJG_MC}}</td>

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

@@ -40,11 +40,18 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http'])
 
         $scope.currentTab = 0;
         $scope.func = function (index) {
-            for (var idx in $scope.cycleSheetData) {
+            for (var idx in $scope.receitpData) {
                 if (index == idx) {
-                    $scope.cycleSheetData[idx].isActive = true;
+                    $scope.receitpData[idx].isActive = true;
                 } else {
-                    $scope.cycleSheetData[idx].isActive = false;
+                    $scope.receitpData[idx].isActive = false;
+                }
+            }
+            for (var idx in $scope.receitpHistoryData) {
+                if (index == idx) {
+                    $scope.receitpHistoryData[idx].isActive = true;
+                } else {
+                    $scope.receitpHistoryData[idx].isActive = false;
                 }
             }
             $scope.currentTab = index;
@@ -87,14 +94,14 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http'])
             }
             HttpService.getHistoryReceitp(startDate,endDate,function(data){
                 $scope.receitpHistoryData=data;
-                for(var i=0;i<$scope.receitpData.length;i++){
+                for(var i=0;i<$scope.receitpHistoryData.length;i++){
                     if(i==$scope.currentTab){
-                        $scope.receitpData[i].isActive=true;
+                        $scope.receitpHistoryData[i].isActive=true;
                     }else{
-                        $scope.receitpData[i].isActive=false;
+                        $scope.receitpHistoryData[i].isActive=false;
                     }
                 }
-                console.log($scope.receitpData);
+                console.log($scope.receitpHistoryData);
             })
         }
 
@@ -112,10 +119,12 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http'])
         }
 
         $scope.printReceitp = function(typeCode) {
-            var date = $('#datepicker').val();
+            var startDate=$('#datepicker1').val();
+            var endDate=$('#datepicker2').val();
             var json={
                 type:typeCode,
-                date:date,
+                startDate:startDate,
+                endDate:endDate,
                 list:[]
             }
             var checks = $(".checkAllPolice:checked")